diff --git a/app_fenrir/build.gradle b/app_fenrir/build.gradle
index 21884db4a..a0c9d77d8 100644
--- a/app_fenrir/build.gradle
+++ b/app_fenrir/build.gradle
@@ -18,6 +18,7 @@ android {
         exclude("META-INF/LICENSE")
         exclude("META-INF/NOTICE")
         exclude("META-INF/*.version")
+        exclude("META-INF/versions/**")
     }
 
     dependenciesInfo {
diff --git a/app_fenrir/src/main/AndroidManifest.xml b/app_fenrir/src/main/AndroidManifest.xml
index e36b34188..4e7c2faba 100644
--- a/app_fenrir/src/main/AndroidManifest.xml
+++ b/app_fenrir/src/main/AndroidManifest.xml
@@ -401,6 +401,14 @@
             android:theme="@style/App.DayNight.Swipes"
             android:windowSoftInputMode="adjustResize|stateHidden" />
 
+        <activity
+            android:name="dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity"
+            android:configChanges="keyboardHidden|orientation"
+            android:exported="true"
+            android:label="@string/clips"
+            android:theme="@style/App.DayNight.Swipes"
+            android:windowSoftInputMode="adjustResize|stateHidden" />
+
         <activity
             android:name="dev.ragnarok.fenrir.activity.SinglePhotoActivity"
             android:configChanges="keyboardHidden|orientation"
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Constants.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Constants.kt
index ce32ed40e..751a99243 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Constants.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Constants.kt
@@ -1,11 +1,11 @@
 package dev.ragnarok.fenrir
 
 import android.content.res.Resources
-import java.util.*
 
 object Constants {
     const val API_VERSION = "5.131"
-    const val AUTH_VERSION = "5.131"
+    const val AUTH_VERSION = API_VERSION
+
     const val DATABASE_FENRIR_VERSION = 27
     const val DATABASE_TEMPORARY_VERSION = 5
     const val EXPORT_SETTINGS_FORMAT = 1
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Extra.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Extra.kt
index 10a675c67..241bfcfb5 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Extra.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Extra.kt
@@ -65,6 +65,7 @@ object Extra {
     const val OWNER = "owner"
     const val OWNERS = "owners"
     const val OWNER_ID = "owner_id"
+    const val NO_OWNER_ID = "no_owner_id"
     const val PASSWORD = "password"
     const val PATH = "path"
     const val PEER = "peer"
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Includes.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Includes.kt
index edda285d5..7fa4b4532 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Includes.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/Includes.kt
@@ -74,7 +74,7 @@ object Includes {
     }
 
     val validationProvider: IValidateProvider by lazy {
-        ValidateProvider(provideApplicationContext(), provideMainThreadScheduler())
+        ValidateProvider(provideApplicationContext())
     }
 
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivity.kt
index 45d8990a7..f3c6e4ee4 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivity.kt
@@ -13,6 +13,7 @@ import dev.ragnarok.fenrir.Extra
 import dev.ragnarok.fenrir.R
 import dev.ragnarok.fenrir.activity.gifpager.GifPagerActivity
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.newInstance
+import dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity
 import dev.ragnarok.fenrir.activity.slidr.Slidr.attach
 import dev.ragnarok.fenrir.activity.slidr.model.SlidrConfig
 import dev.ragnarok.fenrir.activity.storypager.StoryPagerActivity
@@ -100,6 +101,11 @@ class ChatActivity : NoMainActivity(), PlaceProvider, AppStyleable {
                 StoryPagerActivity.newInstance(this, args)
             )
 
+            Place.SHORT_VIDEOS -> place.launchActivityForResult(
+                this,
+                ShortVideoPagerActivity.newInstance(this, args)
+            )
+
             Place.SINGLE_PHOTO -> place.launchActivityForResult(
                 this,
                 SinglePhotoActivity.newInstance(this, args)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivityBubbles.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivityBubbles.kt
index c25c2b008..7960699b7 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivityBubbles.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ChatActivityBubbles.kt
@@ -14,6 +14,7 @@ import dev.ragnarok.fenrir.Extra
 import dev.ragnarok.fenrir.R
 import dev.ragnarok.fenrir.activity.gifpager.GifPagerActivity
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.newInstance
+import dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity
 import dev.ragnarok.fenrir.activity.slidr.Slidr.attach
 import dev.ragnarok.fenrir.activity.slidr.model.SlidrConfig
 import dev.ragnarok.fenrir.activity.slidr.model.SlidrListener
@@ -115,6 +116,11 @@ class ChatActivityBubbles : NoMainActivity(), PlaceProvider, AppStyleable {
                 StoryPagerActivity.newInstance(this, args)
             )
 
+            Place.SHORT_VIDEOS -> place.launchActivityForResult(
+                this,
+                ShortVideoPagerActivity.newInstance(this, args)
+            )
+
             Place.GIF_PAGER -> place.launchActivityForResult(
                 this,
                 GifPagerActivity.newInstance(this, args)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LocalJsonToChatActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LocalJsonToChatActivity.kt
index 26d9d831e..537f87457 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LocalJsonToChatActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LocalJsonToChatActivity.kt
@@ -13,6 +13,7 @@ import dev.ragnarok.fenrir.Extra
 import dev.ragnarok.fenrir.R
 import dev.ragnarok.fenrir.activity.gifpager.GifPagerActivity
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.newInstance
+import dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity
 import dev.ragnarok.fenrir.activity.storypager.StoryPagerActivity
 import dev.ragnarok.fenrir.fragment.audio.AudioPlayerFragment
 import dev.ragnarok.fenrir.fragment.audio.AudioPlayerFragment.Companion.newInstance
@@ -100,6 +101,11 @@ class LocalJsonToChatActivity : NoMainActivity(), PlaceProvider, AppStyleable {
                 StoryPagerActivity.newInstance(this, args)
             )
 
+            Place.SHORT_VIDEOS -> place.launchActivityForResult(
+                this,
+                ShortVideoPagerActivity.newInstance(this, args)
+            )
+
             Place.SINGLE_PHOTO -> place.launchActivityForResult(
                 this,
                 SinglePhotoActivity.newInstance(this, args)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LoginActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LoginActivity.kt
index d6d53d0c7..18e795387 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LoginActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/LoginActivity.kt
@@ -35,6 +35,10 @@ class LoginActivity : AppCompatActivity() {
         setContentView(R.layout.activity_login)
         val webview = findViewById<WebView>(R.id.vkontakteview)
         webview.settings.javaScriptEnabled = true
+        webview.settings.domStorageEnabled = true
+        webview.settings.blockNetworkLoads = false
+        webview.settings.blockNetworkImage = false
+        webview.settings.databaseEnabled = true
         webview.clearCache(true)
         webview.settings.userAgentString = getUserAgentByType(Constants.DEFAULT_ACCOUNT_TYPE)
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt
index 10503a50a..53d403873 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/MainActivity.kt
@@ -40,6 +40,7 @@ import dev.ragnarok.fenrir.activity.EnterPinActivity.Companion.getClass
 import dev.ragnarok.fenrir.activity.gifpager.GifPagerActivity
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.newInstance
 import dev.ragnarok.fenrir.activity.qr.CameraScanActivity
+import dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity
 import dev.ragnarok.fenrir.activity.storypager.StoryPagerActivity
 import dev.ragnarok.fenrir.db.Stores
 import dev.ragnarok.fenrir.dialog.ResolveDomainDialog
@@ -86,6 +87,7 @@ import dev.ragnarok.fenrir.fragment.friends.friendstabs.FriendsTabsFragment
 import dev.ragnarok.fenrir.fragment.gifts.GiftsFragment
 import dev.ragnarok.fenrir.fragment.groupchats.GroupChatsFragment
 import dev.ragnarok.fenrir.fragment.likes.LikesFragment
+import dev.ragnarok.fenrir.fragment.likes.storiesview.StoriesViewFragment
 import dev.ragnarok.fenrir.fragment.localserver.filemanagerremote.FileManagerRemoteFragment
 import dev.ragnarok.fenrir.fragment.localserver.photoslocalserver.PhotosLocalServerFragment
 import dev.ragnarok.fenrir.fragment.logs.LogsFragment
@@ -615,7 +617,7 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                     val menus = ModalBottomSheetDialogFragment.Builder()
                     menus.add(
                         OptionRequest(
-                            R.id.button_ok,
+                            0,
                             getString(R.string.set_offline),
                             R.drawable.offline,
                             true
@@ -623,7 +625,7 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                     )
                     menus.add(
                         OptionRequest(
-                            R.id.button_cancel,
+                            1,
                             getString(R.string.open_clipboard_url),
                             R.drawable.web,
                             false
@@ -631,7 +633,25 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                     )
                     menus.add(
                         OptionRequest(
-                            R.id.action_preferences,
+                            2,
+                            getString(R.string.stories),
+                            R.drawable.story_outline,
+                            true
+                        )
+                    )
+                    if (Utils.isOfficialVKCurrent) {
+                        menus.add(
+                            OptionRequest(
+                                3,
+                                getString(R.string.clips),
+                                R.drawable.clip_outline,
+                                true
+                            )
+                        )
+                    }
+                    menus.add(
+                        OptionRequest(
+                            4,
                             getString(R.string.settings),
                             R.drawable.preferences,
                             true
@@ -639,7 +659,7 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                     )
                     menus.add(
                         OptionRequest(
-                            R.id.button_camera,
+                            5,
                             getString(R.string.scan_qr),
                             R.drawable.qr_code,
                             false
@@ -650,8 +670,8 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                         "left_options",
                         object : ModalBottomSheetDialogFragment.Listener {
                             override fun onModalOptionSelected(option: Option) {
-                                when {
-                                    option.id == R.id.button_ok -> {
+                                when (option.id) {
+                                    0 -> {
                                         mCompositeDisposable.add(InteractorFactory.createAccountInteractor()
                                             .setOffline(
                                                 Settings.get().accounts().current
@@ -664,7 +684,7 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                                             })
                                     }
 
-                                    option.id == R.id.button_cancel -> {
+                                    1 -> {
                                         val clipBoard =
                                             getSystemService(CLIPBOARD_SERVICE) as ClipboardManager?
                                         if (clipBoard != null && clipBoard.primaryClip != null && (clipBoard.primaryClip?.itemCount
@@ -682,12 +702,42 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                                         }
                                     }
 
-                                    option.id == R.id.action_preferences -> {
+                                    2 -> {
+                                        mCompositeDisposable.add(InteractorFactory.createStoriesInteractor()
+                                            .getStory(
+                                                Settings.get().accounts().current,
+                                                null
+                                            )
+                                            .fromIOToMain()
+                                            .subscribe({
+                                                if (it.isEmpty()) {
+                                                    createCustomToast(this@MainActivity).showToastError(
+                                                        R.string.list_is_empty
+                                                    )
+                                                }
+                                                PlaceFactory.getHistoryVideoPreviewPlace(
+                                                    mAccountId,
+                                                    ArrayList(it),
+                                                    0
+                                                ).tryOpenWith(this@MainActivity)
+                                            }) {
+                                                createCustomToast(this@MainActivity).showToastThrowable(
+                                                    it
+                                                )
+                                            })
+                                    }
+
+                                    3 -> {
+                                        PlaceFactory.getShortVideoPlace(mAccountId, null)
+                                            .tryOpenWith(this@MainActivity)
+                                    }
+
+                                    4 -> {
                                         PlaceFactory.getPreferencesPlace(mAccountId)
                                             .tryOpenWith(this@MainActivity)
                                     }
 
-                                    option.id == R.id.button_camera && FenrirNative.isNativeLoaded -> {
+                                    5 -> {
                                         val intent =
                                             Intent(
                                                 this@MainActivity,
@@ -1284,6 +1334,11 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
                 StoryPagerActivity.newInstance(this, args)
             )
 
+            Place.SHORT_VIDEOS -> place.launchActivityForResult(
+                this,
+                ShortVideoPagerActivity.newInstance(this, args)
+            )
+
             Place.FRIENDS_AND_FOLLOWERS -> attachToFront(FriendsTabsFragment.newInstance(args))
             Place.EXTERNAL_LINK -> attachToFront(BrowserFragment.newInstance(args))
             Place.DOC_PREVIEW -> {
@@ -1480,6 +1535,7 @@ open class MainActivity : AppCompatActivity(), NavigationDrawerCallbacks, OnSect
 
             Place.NOTIFICATION_SETTINGS -> attachToFront(NotificationPreferencesFragment())
             Place.LIKES_AND_COPIES -> attachToFront(LikesFragment.newInstance(args))
+            Place.STORIES_VIEWS -> attachToFront(StoriesViewFragment.newInstance(args))
             Place.CREATE_PHOTO_ALBUM, Place.EDIT_PHOTO_ALBUM -> {
                 val createPhotoAlbumFragment = CreatePhotoAlbumFragment.newInstance(args)
                 attachToFront(createPhotoAlbumFragment)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/NotReadMessagesActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/NotReadMessagesActivity.kt
index cf3a2e291..5e057e4d7 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/NotReadMessagesActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/NotReadMessagesActivity.kt
@@ -13,6 +13,7 @@ import dev.ragnarok.fenrir.Extra
 import dev.ragnarok.fenrir.R
 import dev.ragnarok.fenrir.activity.gifpager.GifPagerActivity
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.newInstance
+import dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity
 import dev.ragnarok.fenrir.activity.slidr.Slidr.attach
 import dev.ragnarok.fenrir.activity.slidr.model.SlidrConfig
 import dev.ragnarok.fenrir.activity.slidr.model.SlidrListener
@@ -115,6 +116,11 @@ class NotReadMessagesActivity : NoMainActivity(), PlaceProvider, AppStyleable {
                 StoryPagerActivity.newInstance(this, args)
             )
 
+            Place.SHORT_VIDEOS -> place.launchActivityForResult(
+                this,
+                ShortVideoPagerActivity.newInstance(this, args)
+            )
+
             Place.SINGLE_PHOTO -> place.launchActivityForResult(
                 this,
                 SinglePhotoActivity.newInstance(this, args)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/SinglePhotoActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/SinglePhotoActivity.kt
index ea997a4ee..0a6c36875 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/SinglePhotoActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/SinglePhotoActivity.kt
@@ -45,7 +45,8 @@ import java.io.File
 import java.lang.ref.WeakReference
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Date
 import java.util.concurrent.TimeUnit
 
 class SinglePhotoActivity : NoMainActivity(), PlaceProvider, AppStyleable {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ValidateActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ValidateActivity.kt
index d70e4ea4a..4a634dc07 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ValidateActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/ValidateActivity.kt
@@ -85,6 +85,10 @@ class ValidateActivity : AppCompatActivity() {
         )
         val webview = findViewById<WebView>(R.id.vkontakteview)
         webview.settings.javaScriptEnabled = true
+        webview.settings.domStorageEnabled = true
+        webview.settings.blockNetworkLoads = false
+        webview.settings.blockNetworkImage = false
+        webview.settings.databaseEnabled = true
         webview.clearCache(true)
         webview.settings.userAgentString = UserAgentTool.getAccountUserAgent(accountId)
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/crash/CrashUtils.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/crash/CrashUtils.kt
index d1b9883cd..a4137e801 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/crash/CrashUtils.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/crash/CrashUtils.kt
@@ -15,7 +15,8 @@ import java.io.PrintWriter
 import java.io.StringWriter
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 object CrashUtils {
     private const val TAG = "CrashUtils"
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/photopager/PhotoPagerActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/photopager/PhotoPagerActivity.kt
index 330588c8e..e38e23e22 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/photopager/PhotoPagerActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/photopager/PhotoPagerActivity.kt
@@ -59,7 +59,6 @@ import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
 import dev.ragnarok.fenrir.view.pager.WeakPicassoLoadCallback
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
-import java.util.*
 import java.util.concurrent.TimeUnit
 
 class PhotoPagerActivity : BaseMvpActivity<PhotoPagerPresenter, IPhotoPagerView>(), IPhotoPagerView,
@@ -569,7 +568,7 @@ class PhotoPagerActivity : BaseMvpActivity<PhotoPagerPresenter, IPhotoPagerView>
     override fun displayPhotos(photos: List<Photo>, initialIndex: Int) {
         if (bShowPhotosLine) {
             if (photos.size <= 1) {
-                mAdapterRecycler.setData(Collections.emptyList())
+                mAdapterRecycler.setData(emptyList())
                 mAdapterRecycler.notifyDataSetChanged()
             } else {
                 mAdapterRecycler.setData(photos)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CameraScanActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CameraScanActivity.kt
index 4f4d7ab5f..7292ab63b 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CameraScanActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CameraScanActivity.kt
@@ -32,7 +32,8 @@ import dev.ragnarok.fenrir.util.AppPerms
 import dev.ragnarok.fenrir.util.AppPerms.requestPermissionsResultAbs
 import dev.ragnarok.fenrir.util.Utils
 import java.nio.ByteBuffer
-import java.util.*
+import java.util.EnumMap
+import java.util.EnumSet
 
 class CameraScanActivity : NoMainActivity() {
     private lateinit var textureView: PreviewView
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CustomQRCodeWriter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CustomQRCodeWriter.kt
index a52d90812..5f45c4073 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CustomQRCodeWriter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/qr/CustomQRCodeWriter.kt
@@ -10,7 +10,7 @@ import com.google.zxing.WriterException
 import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel
 import com.google.zxing.qrcode.encoder.ByteMatrix
 import com.google.zxing.qrcode.encoder.Encoder
-import java.util.*
+import java.util.Arrays
 import kotlin.math.roundToInt
 
 class CustomQRCodeWriter {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/selectprofiles/SelectedProfilesAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/selectprofiles/SelectedProfilesAdapter.kt
index 3e86c8e83..2317fb717 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/selectprofiles/SelectedProfilesAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/selectprofiles/SelectedProfilesAdapter.kt
@@ -14,7 +14,6 @@ import dev.ragnarok.fenrir.model.Owner
 import dev.ragnarok.fenrir.model.User
 import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
 import dev.ragnarok.fenrir.settings.CurrentTheme
-import java.util.EventListener
 
 class SelectedProfilesAdapter(private val mContext: Context, private val mData: List<Owner>) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -99,7 +98,7 @@ class SelectedProfilesAdapter(private val mContext: Context, private val mData:
         notifyItemChanged(0)
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onClick(adapterPosition: Int, owner: Owner)
         fun onCheckClick()
     }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/IShortVideoPagerView.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/IShortVideoPagerView.kt
new file mode 100644
index 000000000..c294aaf2d
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/IShortVideoPagerView.kt
@@ -0,0 +1,33 @@
+package dev.ragnarok.fenrir.activity.shortvideopager
+
+import androidx.annotation.StringRes
+import dev.ragnarok.fenrir.fragment.base.core.IErrorView
+import dev.ragnarok.fenrir.fragment.base.core.IMvpView
+import dev.ragnarok.fenrir.fragment.base.core.IToastView
+import dev.ragnarok.fenrir.media.story.IStoryPlayer
+import dev.ragnarok.fenrir.model.Commented
+import dev.ragnarok.fenrir.model.Video
+
+interface IShortVideoPagerView : IMvpView, IErrorView, IToastView {
+    fun displayData(pageCount: Int, selectedIndex: Int)
+    fun setAspectRatioAt(position: Int, w: Int, h: Int)
+    fun setPreparingProgressVisible(position: Int, preparing: Boolean)
+    fun attachDisplayToPlayer(adapterPosition: Int, storyPlayer: IStoryPlayer?)
+    fun setToolbarTitle(@StringRes titleRes: Int, vararg params: Any?)
+    fun setToolbarSubtitle(shortVideo: Video, account_id: Long)
+    fun onShare(shortVideo: Video, account_id: Long)
+    fun configHolder(adapterPosition: Int, progress: Boolean, aspectRatioW: Int, aspectRatioH: Int)
+    fun onNext()
+    fun requestWriteExternalStoragePermission()
+    fun showMessage(@StringRes message: Int, error: Boolean)
+    fun showMessage(message: String, error: Boolean)
+    fun updateCount(count: Int)
+    fun notifyDataSetChanged()
+    fun notifyDataAdded(pos: Int, count: Int)
+    fun displayListLoading(loading: Boolean)
+
+    fun displayLikes(count: Int, userLikes: Boolean)
+    fun displayCommentCount(count: Int)
+    fun showComments(accountId: Long, commented: Commented)
+    fun goToLikes(accountId: Long, type: String, ownerId: Long, id: Int)
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/ShortVideoPagerActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/ShortVideoPagerActivity.kt
new file mode 100644
index 000000000..4793739af
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/ShortVideoPagerActivity.kt
@@ -0,0 +1,589 @@
+package dev.ragnarok.fenrir.activity.shortvideopager
+
+import android.Manifest
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.graphics.Color
+import android.os.Bundle
+import android.util.SparseArray
+import android.view.*
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.annotation.LayoutRes
+import androidx.annotation.StringRes
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.snackbar.Snackbar
+import com.squareup.picasso3.Transformation
+import dev.ragnarok.fenrir.*
+import dev.ragnarok.fenrir.activity.ActivityFeatures
+import dev.ragnarok.fenrir.activity.BaseMvpActivity
+import dev.ragnarok.fenrir.activity.SendAttachmentsActivity
+import dev.ragnarok.fenrir.activity.slidr.Slidr
+import dev.ragnarok.fenrir.activity.slidr.model.SlidrConfig
+import dev.ragnarok.fenrir.activity.slidr.model.SlidrListener
+import dev.ragnarok.fenrir.activity.slidr.model.SlidrPosition
+import dev.ragnarok.fenrir.domain.ILikesInteractor
+import dev.ragnarok.fenrir.fragment.audio.AudioPlayerFragment
+import dev.ragnarok.fenrir.fragment.base.core.IPresenterFactory
+import dev.ragnarok.fenrir.listener.AppStyleable
+import dev.ragnarok.fenrir.media.story.IStoryPlayer
+import dev.ragnarok.fenrir.model.Commented
+import dev.ragnarok.fenrir.model.Video
+import dev.ragnarok.fenrir.place.Place
+import dev.ragnarok.fenrir.place.PlaceFactory
+import dev.ragnarok.fenrir.place.PlaceProvider
+import dev.ragnarok.fenrir.settings.CurrentTheme
+import dev.ragnarok.fenrir.settings.Settings
+import dev.ragnarok.fenrir.util.AppPerms.requestPermissionsAbs
+import dev.ragnarok.fenrir.util.AppTextUtils
+import dev.ragnarok.fenrir.util.HelperSimple
+import dev.ragnarok.fenrir.util.Utils
+import dev.ragnarok.fenrir.util.ViewUtils
+import dev.ragnarok.fenrir.util.rxutils.RxUtils
+import dev.ragnarok.fenrir.util.toast.CustomSnackbars
+import dev.ragnarok.fenrir.view.CircleCounterButton
+import dev.ragnarok.fenrir.view.ExpandableSurfaceView
+import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+import io.reactivex.rxjava3.core.Completable
+import io.reactivex.rxjava3.disposables.Disposable
+import java.lang.ref.WeakReference
+import java.util.concurrent.TimeUnit
+
+class ShortVideoPagerActivity : BaseMvpActivity<ShortVideoPagerPresenter, IShortVideoPagerView>(),
+    IShortVideoPagerView, PlaceProvider, AppStyleable {
+    private val mHolderSparseArray = SparseArray<WeakReference<Holder>>()
+    private var mViewPager: ViewPager2? = null
+    private var mToolbar: Toolbar? = null
+    private var mAvatar: ImageView? = null
+    private var transformation: Transformation? = null
+    private var mDownload: CircleCounterButton? = null
+    private var mShare: CircleCounterButton? = null
+    private var likeButton: CircleCounterButton? = null
+    private var commentsButton: CircleCounterButton? = null
+    private var mFullscreen = false
+    private var mContentRoot: View? = null
+    private var helpDisposable = Disposable.disposed()
+    private var mAdapter: Adapter? = null
+    private var mLoadingProgressBarDispose = Disposable.disposed()
+    private var mLoadingProgressBarLoaded = false
+    private var mLoadingProgressBar: RLottieImageView? = null
+    private var shortVideoLength: TextView? = null
+
+    @LayoutRes
+    override fun getNoMainContentView(): Int {
+        return R.layout.activity_shortvideo_pager
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        mFullscreen = savedInstanceState?.getBoolean("mFullscreen") ?: false
+        transformation = CurrentTheme.createTransformationForAvatar()
+        mContentRoot = findViewById<RelativeLayout>(R.id.shortvideo_pager_root)
+        mToolbar = findViewById(R.id.toolbar)
+        setSupportActionBar(mToolbar)
+        mAvatar = findViewById(R.id.toolbar_avatar)
+        mViewPager = findViewById(R.id.view_pager)
+        mViewPager?.offscreenPageLimit = 1
+        likeButton = findViewById(R.id.like_button)
+        commentsButton = findViewById(R.id.comments_button)
+        shortVideoLength = findViewById(R.id.item_short_video_length)
+        commentsButton?.setOnClickListener {
+            presenter?.fireCommentsClick()
+        }
+        likeButton?.setOnClickListener {
+            presenter?.fireLikeClick()
+        }
+        likeButton?.setOnLongClickListener {
+            presenter?.fireLikeLongClick()
+            true
+        }
+        mLoadingProgressBar = findViewById(R.id.loading_progress_bar)
+        mViewPager?.setPageTransformer(
+            Utils.createPageTransform(
+                Settings.get().main().viewpager_page_transform
+            )
+        )
+        val mHelper = findViewById<RLottieImageView?>(R.id.swipe_helper)
+        if (HelperSimple.needHelp(HelperSimple.SHORT_VIDEO_HELPER, 2)) {
+            mHelper?.visibility = View.VISIBLE
+            mHelper?.fromRes(
+                dev.ragnarok.fenrir_common.R.raw.story_guide_hand_swipe,
+                Utils.dp(500F),
+                Utils.dp(500F),
+                intArrayOf(0x333333, CurrentTheme.getColorSecondary(this))
+            )
+            mHelper?.playAnimation()
+            helpDisposable = Completable.create {
+                it.onComplete()
+            }.delay(5, TimeUnit.SECONDS).fromIOToMain().subscribe({
+                mHelper?.clearAnimationDrawable()
+                mHelper?.visibility = View.GONE
+            }, RxUtils.ignore())
+        } else {
+            mHelper?.visibility = View.GONE
+        }
+        mViewPager?.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                super.onPageSelected(position)
+                presenter?.firePageSelected(position)
+            }
+        })
+        mDownload = findViewById(R.id.button_download)
+        mShare = findViewById(R.id.button_share)
+        mShare?.setOnClickListener { presenter?.fireShareButtonClick() }
+        mDownload?.setOnClickListener { presenter?.fireDownloadButtonClick() }
+        resolveFullscreenViews()
+        val mButtonsRoot: View = findViewById(R.id.buttons)
+
+        Slidr.attach(
+            this,
+            SlidrConfig.Builder().setAlphaForView(false).fromUnColoredToColoredStatusBar(true)
+                .position(SlidrPosition.LEFT)
+                .listener(object : SlidrListener {
+                    override fun onSlideStateChanged(state: Int) {
+
+                    }
+
+                    @SuppressLint("Range")
+                    override fun onSlideChange(percent: Float) {
+                        var tmp = 1f - percent
+                        tmp *= 4
+                        tmp = Utils.clamp(1f - tmp, 0f, 1f)
+                        if (Utils.hasOreo()) {
+                            mContentRoot?.setBackgroundColor(Color.argb(tmp, 0f, 0f, 0f))
+                        } else {
+                            mContentRoot?.setBackgroundColor(
+                                Color.argb(
+                                    (tmp * 255).toInt(),
+                                    0,
+                                    0,
+                                    0
+                                )
+                            )
+                        }
+                        mButtonsRoot.alpha = tmp
+                        mToolbar?.alpha = tmp
+                        mViewPager?.alpha = Utils.clamp(percent, 0f, 1f)
+                    }
+
+                    override fun onSlideOpened() {
+
+                    }
+
+                    override fun onSlideClosed(): Boolean {
+                        finish()
+                        overridePendingTransition(0, 0)
+                        return true
+                    }
+
+                }).build()
+        )
+    }
+
+    override fun displayLikes(count: Int, userLikes: Boolean) {
+        likeButton?.setIcon(if (userLikes) R.drawable.heart_filled else R.drawable.heart)
+        likeButton?.count = count
+        likeButton?.isActive = userLikes
+    }
+
+    override fun displayCommentCount(count: Int) {
+        commentsButton?.count = count
+    }
+
+    override fun showComments(accountId: Long, commented: Commented) {
+        PlaceFactory.getCommentsPlace(accountId, commented, null).tryOpenWith(this)
+    }
+
+    override fun goToLikes(accountId: Long, type: String, ownerId: Long, id: Int) {
+        PlaceFactory.getLikesCopiesPlace(
+            accountId,
+            type,
+            ownerId,
+            id,
+            ILikesInteractor.FILTER_LIKES
+        )
+            .tryOpenWith(this)
+    }
+
+    override fun displayListLoading(loading: Boolean) {
+        mLoadingProgressBarDispose.dispose()
+        if (loading) {
+            mLoadingProgressBarDispose = Completable.create {
+                it.onComplete()
+            }.delay(300, TimeUnit.MILLISECONDS).fromIOToMain().subscribe({
+                mLoadingProgressBarLoaded = true
+                mLoadingProgressBar?.visibility = View.VISIBLE
+                mLoadingProgressBar?.fromRes(
+                    dev.ragnarok.fenrir_common.R.raw.loading,
+                    Utils.dp(100F),
+                    Utils.dp(100F),
+                    intArrayOf(
+                        0x000000,
+                        Color.WHITE,
+                        0x777777,
+                        Color.WHITE
+                    )
+                )
+                mLoadingProgressBar?.playAnimation()
+            }, RxUtils.ignore())
+        } else if (mLoadingProgressBarLoaded) {
+            mLoadingProgressBarLoaded = false
+            mLoadingProgressBar?.visibility = View.GONE
+            mLoadingProgressBar?.clearAnimationDrawable()
+        }
+    }
+
+    override fun showMessage(@StringRes message: Int, error: Boolean) {
+        CustomSnackbars.createCustomSnackbars(mContentRoot, null, true)
+            ?.setDurationSnack(Snackbar.LENGTH_LONG)?.let {
+                if (error) {
+                    it.coloredSnack(message, Color.parseColor("#ff0000")).show()
+                } else {
+                    it.defaultSnack(message).show()
+                }
+            }
+    }
+
+    override fun showMessage(message: String, error: Boolean) {
+        CustomSnackbars.createCustomSnackbars(mContentRoot, null, true)
+            ?.setDurationSnack(Snackbar.LENGTH_LONG)?.let {
+                if (error) {
+                    it.coloredSnack(message, Color.parseColor("#ff0000")).show()
+                } else {
+                    it.defaultSnack(message).show()
+                }
+            }
+    }
+
+    override fun updateCount(count: Int) {
+        mAdapter?.updateCount(count)
+    }
+
+    override fun notifyDataSetChanged() {
+        mAdapter?.notifyDataSetChanged()
+    }
+
+    override fun notifyDataAdded(pos: Int, count: Int) {
+        mAdapter?.notifyItemRangeInserted(pos, count)
+    }
+
+    override fun openPlace(place: Place) {
+        val args = place.safeArguments()
+        when (place.type) {
+            Place.PLAYER -> {
+                val player = supportFragmentManager.findFragmentByTag("audio_player")
+                if (player is AudioPlayerFragment) player.dismiss()
+                AudioPlayerFragment.newInstance(args).show(supportFragmentManager, "audio_player")
+            }
+
+            else -> Utils.openPlaceWithSwipebleActivity(this, place)
+        }
+    }
+
+    override fun hideMenu(hide: Boolean) {}
+    override fun openMenu(open: Boolean) {}
+
+    @Suppress("DEPRECATION")
+    override fun setStatusbarColored(colored: Boolean, invertIcons: Boolean) {
+        val statusbarNonColored = CurrentTheme.getStatusBarNonColored(this)
+        val statusbarColored = CurrentTheme.getStatusBarColor(this)
+        val w = window
+        w.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
+        w.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS)
+        w.statusBarColor = if (colored) statusbarColored else statusbarNonColored
+        @ColorInt val navigationColor =
+            if (colored) CurrentTheme.getNavigationBarColor(this) else Color.BLACK
+        w.navigationBarColor = navigationColor
+        if (Utils.hasMarshmallow()) {
+            var flags = window.decorView.systemUiVisibility
+            flags = if (invertIcons) {
+                flags or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+            } else {
+                flags and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
+            }
+            window.decorView.systemUiVisibility = flags
+        }
+        if (Utils.hasOreo()) {
+            var flags = window.decorView.systemUiVisibility
+            if (invertIcons) {
+                flags = flags or View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                w.decorView.systemUiVisibility = flags
+                w.navigationBarColor = Color.WHITE
+            } else {
+                flags = flags and View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
+                w.decorView.systemUiVisibility = flags
+            }
+        }
+    }
+
+    private val requestWritePermission = requestPermissionsAbs(
+        arrayOf(
+            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+            Manifest.permission.READ_EXTERNAL_STORAGE
+        )
+    ) {
+        lazyPresenter { fireWritePermissionResolved() }
+    }
+
+    override fun requestWriteExternalStoragePermission() {
+        requestWritePermission.launch()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putBoolean("mFullscreen", mFullscreen)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        ActivityFeatures.Builder()
+            .begin()
+            .setHideNavigationMenu(true)
+            .setBarsColored(colored = false, invertIcons = false)
+            .build()
+            .apply(this)
+    }
+
+    internal fun toggleFullscreen() {
+        mFullscreen = !mFullscreen
+        resolveFullscreenViews()
+    }
+
+    private fun resolveFullscreenViews() {
+        mToolbar?.visibility = if (mFullscreen) View.GONE else View.VISIBLE
+        mDownload?.visibility = if (mFullscreen) View.GONE else View.VISIBLE
+        mShare?.visibility = if (mFullscreen) View.GONE else View.VISIBLE
+        likeButton?.visibility = if (mFullscreen) View.GONE else View.VISIBLE
+        commentsButton?.visibility = if (mFullscreen) View.GONE else View.VISIBLE
+    }
+
+    override fun getPresenterFactory(saveInstanceState: Bundle?): IPresenterFactory<ShortVideoPagerPresenter> =
+        object : IPresenterFactory<ShortVideoPagerPresenter> {
+            override fun create(): ShortVideoPagerPresenter {
+                val aid = requireArguments().getLong(Extra.ACCOUNT_ID)
+                val ownerId: Long? = if (!requireArguments().getBoolean(Extra.NO_OWNER_ID)) {
+                    requireArguments().getLong(Extra.OWNER_ID)
+                } else {
+                    null
+                }
+                return ShortVideoPagerPresenter(
+                    aid,
+                    ownerId,
+                    this@ShortVideoPagerActivity,
+                    saveInstanceState
+                )
+            }
+        }
+
+    override fun displayData(pageCount: Int, selectedIndex: Int) {
+        mAdapter = Adapter(pageCount)
+        mViewPager?.adapter = mAdapter
+        mViewPager?.setCurrentItem(selectedIndex, false)
+    }
+
+    override fun setAspectRatioAt(position: Int, w: Int, h: Int) {
+        findByPosition(position)?.setAspectRatio(w, h)
+    }
+
+    override fun setPreparingProgressVisible(position: Int, preparing: Boolean) {
+        for (i in 0 until mHolderSparseArray.size()) {
+            val key = mHolderSparseArray.keyAt(i)
+            val holder = findByPosition(key)
+            val isCurrent = position == key
+            val progressVisible = isCurrent && preparing
+            holder?.setProgressVisible(progressVisible)
+            holder?.setSurfaceVisible(if (isCurrent && !preparing) View.VISIBLE else View.GONE)
+        }
+    }
+
+    override fun attachDisplayToPlayer(adapterPosition: Int, storyPlayer: IStoryPlayer?) {
+        val holder = findByPosition(adapterPosition)
+        if (holder?.isSurfaceReady == true) {
+            storyPlayer?.setDisplay(holder.mSurfaceHolder)
+        }
+    }
+
+    override fun setToolbarTitle(@StringRes titleRes: Int, vararg params: Any?) {
+        supportActionBar?.title = getString(titleRes, *params)
+    }
+
+    override fun setToolbarSubtitle(shortVideo: Video, account_id: Long) {
+        supportActionBar?.subtitle = shortVideo.optionalOwner?.fullName
+        mAvatar?.setOnClickListener {
+            shortVideo.optionalOwner?.let { it1 ->
+                PlaceFactory.getOwnerWallPlace(account_id, it1)
+                    .tryOpenWith(this)
+            }
+        }
+        mAvatar?.let {
+            ViewUtils.displayAvatar(
+                it,
+                transformation,
+                shortVideo.optionalOwner?.maxSquareAvatar,
+                Constants.PICASSO_TAG
+            )
+        }
+        shortVideoLength?.text = AppTextUtils.getDurationString(shortVideo.duration)
+        displayLikes(shortVideo.likesCount, shortVideo.isUserLikes)
+        displayCommentCount(shortVideo.commentsCount)
+    }
+
+    override fun onShare(shortVideo: Video, account_id: Long) {
+        SendAttachmentsActivity.startForSendAttachments(this, account_id, shortVideo)
+    }
+
+    override fun configHolder(
+        adapterPosition: Int,
+        progress: Boolean,
+        aspectRatioW: Int,
+        aspectRatioH: Int
+    ) {
+        val holder = findByPosition(adapterPosition)
+        holder?.setProgressVisible(progress)
+        holder?.setAspectRatio(aspectRatioW, aspectRatioH)
+        holder?.setSurfaceVisible(if (progress) View.GONE else View.VISIBLE)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        helpDisposable.dispose()
+        mLoadingProgressBarDispose.dispose()
+    }
+
+    override fun onNext() {
+        mViewPager?.let {
+            it.adapter?.let { so ->
+                if (so.itemCount > it.currentItem + 1) {
+                    it.setCurrentItem(it.currentItem + 1, true)
+                }
+            }
+        }
+    }
+
+    internal fun fireHolderCreate(holder: Holder) {
+        presenter?.fireHolderCreate(holder.bindingAdapterPosition)
+    }
+
+    private fun findByPosition(position: Int): Holder? {
+        val weak = mHolderSparseArray[position]
+        return weak?.get()
+    }
+
+    inner class Holder(rootView: View) : RecyclerView.ViewHolder(rootView), SurfaceHolder.Callback {
+        val mSurfaceView: ExpandableSurfaceView = rootView.findViewById(R.id.videoSurface)
+        val mSurfaceHolder: SurfaceHolder = mSurfaceView.holder
+        val mProgressBar: RLottieImageView
+        var isSurfaceReady = false
+        override fun surfaceCreated(holder: SurfaceHolder) {
+            isSurfaceReady = true
+            presenter?.fireSurfaceCreated(bindingAdapterPosition)
+        }
+
+        override fun surfaceChanged(holder: SurfaceHolder, format: Int, width: Int, height: Int) {}
+        override fun surfaceDestroyed(holder: SurfaceHolder) {
+            isSurfaceReady = false
+        }
+
+        fun setProgressVisible(visible: Boolean) {
+            mProgressBar.visibility = if (visible) View.VISIBLE else View.GONE
+            if (visible) {
+                mProgressBar.fromRes(
+                    dev.ragnarok.fenrir_common.R.raw.loading,
+                    Utils.dp(100F),
+                    Utils.dp(100F),
+                    intArrayOf(
+                        0x000000,
+                        CurrentTheme.getColorPrimary(this@ShortVideoPagerActivity),
+                        0x777777,
+                        CurrentTheme.getColorSecondary(this@ShortVideoPagerActivity)
+                    )
+                )
+                mProgressBar.playAnimation()
+            } else {
+                mProgressBar.clearAnimationDrawable()
+            }
+        }
+
+        fun setAspectRatio(w: Int, h: Int) {
+            mSurfaceView.setAspectRatio(w, h)
+        }
+
+        fun setSurfaceVisible(Vis: Int) {
+            mSurfaceView.visibility = Vis
+        }
+
+        init {
+            mSurfaceHolder.addCallback(this)
+            mProgressBar = rootView.findViewById(R.id.preparing_progress_bar)
+            mSurfaceView.setOnClickListener { toggleFullscreen() }
+        }
+    }
+
+    private inner class Adapter(private var mPageCount: Int) : RecyclerView.Adapter<Holder>() {
+        @SuppressLint("ClickableViewAccessibility")
+        override fun onCreateViewHolder(container: ViewGroup, viewType: Int): Holder {
+            return Holder(
+                LayoutInflater.from(container.context)
+                    .inflate(R.layout.content_shortvideo_page, container, false)
+            )
+        }
+
+        override fun onBindViewHolder(holder: Holder, position: Int) {
+
+        }
+
+        fun updateCount(count: Int) {
+            mPageCount = count
+        }
+
+        override fun getItemCount(): Int {
+            return mPageCount
+        }
+
+        override fun onViewDetachedFromWindow(holder: Holder) {
+            super.onViewDetachedFromWindow(holder)
+            mHolderSparseArray.remove(holder.bindingAdapterPosition)
+        }
+
+        override fun onViewAttachedToWindow(holder: Holder) {
+            super.onViewAttachedToWindow(holder)
+            mHolderSparseArray.put(holder.bindingAdapterPosition, WeakReference(holder))
+            fireHolderCreate(holder)
+        }
+
+        init {
+            mHolderSparseArray.clear()
+        }
+    }
+
+    companion object {
+        const val ACTION_OPEN =
+            "dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity"
+
+        fun newInstance(context: Context, args: Bundle?): Intent {
+            val ph = Intent(context, ShortVideoPagerActivity::class.java)
+            val targetArgs = Bundle()
+            targetArgs.putAll(args)
+            ph.action = ACTION_OPEN
+            ph.putExtras(targetArgs)
+            return ph
+        }
+
+        fun buildArgs(aid: Long, ownerId: Long?): Bundle {
+            val args = Bundle()
+            args.putLong(Extra.ACCOUNT_ID, aid)
+            if (ownerId != null) {
+                args.putBoolean(Extra.NO_OWNER_ID, false)
+                args.putLong(Extra.OWNER_ID, ownerId)
+            } else {
+                args.putBoolean(Extra.NO_OWNER_ID, true)
+            }
+            return args
+        }
+    }
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/ShortVideoPagerPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/ShortVideoPagerPresenter.kt
new file mode 100644
index 000000000..d6b2af3d9
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/shortvideopager/ShortVideoPagerPresenter.kt
@@ -0,0 +1,393 @@
+package dev.ragnarok.fenrir.activity.shortvideopager
+
+import android.content.Context
+import android.os.Bundle
+import dev.ragnarok.fenrir.App.Companion.instance
+import dev.ragnarok.fenrir.Includes.storyPlayerFactory
+import dev.ragnarok.fenrir.R
+import dev.ragnarok.fenrir.domain.IVideosInteractor
+import dev.ragnarok.fenrir.domain.InteractorFactory
+import dev.ragnarok.fenrir.fragment.base.AccountDependencyPresenter
+import dev.ragnarok.fenrir.fromIOToMain
+import dev.ragnarok.fenrir.media.story.IStoryPlayer
+import dev.ragnarok.fenrir.media.story.IStoryPlayer.IStatusChangeListener
+import dev.ragnarok.fenrir.model.Commented
+import dev.ragnarok.fenrir.model.Video
+import dev.ragnarok.fenrir.model.VideoSize
+import dev.ragnarok.fenrir.nonNullNoEmpty
+import dev.ragnarok.fenrir.util.AppPerms.hasReadWriteStoragePermission
+import dev.ragnarok.fenrir.util.DownloadWorkUtils.doDownloadVideo
+import dev.ragnarok.fenrir.util.Pair
+import dev.ragnarok.fenrir.util.Utils
+import dev.ragnarok.fenrir.util.Utils.firstNonEmptyString
+
+class ShortVideoPagerPresenter(
+    accountId: Long,
+    private val ownerId: Long?,
+    private val context: Context,
+    savedInstanceState: Bundle?
+) : AccountDependencyPresenter<IShortVideoPagerView>(accountId, savedInstanceState),
+    IStatusChangeListener, IStoryPlayer.IVideoSizeChangeListener {
+    private var mShortVideoPlayer: IStoryPlayer? = null
+    private val mShortVideos: ArrayList<Video> = ArrayList()
+    private val shortVideosInteractor = InteractorFactory.createStoriesInteractor()
+    private val interactor: IVideosInteractor = InteractorFactory.createVideosInteractor()
+    private var mCurrentIndex = -1
+    private var nextFrom: String? = null
+    private var isEndContent: Boolean = false
+    private var loadingNow = false
+
+    override fun onGuiCreated(viewHost: IShortVideoPagerView) {
+        super.onGuiCreated(viewHost)
+        viewHost.displayData(mShortVideos.size, mCurrentIndex)
+        viewHost.displayListLoading(loadingNow)
+        resolveToolbarTitle()
+        resolvePlayerDisplay()
+        resolveAspectRatio()
+        resolvePreparingProgress()
+        resolveToolbarSubtitle()
+    }
+
+    private fun receiveShortVideos() {
+        loadingNow = true
+        view?.displayListLoading(loadingNow)
+        appendDisposable(
+            shortVideosInteractor.getShortVideos(accountId, ownerId, nextFrom, 25).fromIOToMain()
+                .subscribe(
+                    { onActualShortVideosReceived(nextFrom, it.first, it.second) },
+                    {
+                        loadingNow = false
+                        view?.displayListLoading(loadingNow)
+                        view?.showThrowable(it)
+                    })
+        )
+    }
+
+    private fun onActualShortVideosReceived(
+        startFrom: String?,
+        shortVideos: List<Video>,
+        nextFrom: String?
+    ) {
+        loadingNow = false
+        view?.displayListLoading(loadingNow)
+        this.nextFrom = nextFrom
+        isEndContent = nextFrom.isNullOrEmpty()
+        if (startFrom.isNullOrEmpty()) {
+            if (shortVideos.isEmpty()) {
+                return
+            }
+            mCurrentIndex = 0
+            mShortVideos.clear()
+            mShortVideos.addAll(shortVideos)
+            view?.updateCount(mShortVideos.size)
+            view?.notifyDataSetChanged()
+            initStoryPlayer()
+            resolveToolbarTitle()
+            resolveToolbarSubtitle()
+        } else {
+            val startSize = mShortVideos.size
+            mShortVideos.addAll(shortVideos)
+            view?.updateCount(mShortVideos.size)
+            view?.notifyDataAdded(
+                startSize,
+                shortVideos.size
+            )
+            resolveToolbarTitle()
+            resolveToolbarSubtitle()
+        }
+    }
+
+    fun fireSurfaceCreated(adapterPosition: Int) {
+        if (mCurrentIndex == adapterPosition) {
+            resolvePlayerDisplay()
+        }
+    }
+
+    private fun resolveToolbarTitle() {
+        view?.setToolbarTitle(
+            R.string.image_number,
+            mCurrentIndex + 1,
+            mShortVideos.size
+        )
+    }
+
+    private fun resolvePlayerDisplay() {
+        if (guiIsReady) {
+            view?.attachDisplayToPlayer(
+                mCurrentIndex,
+                mShortVideoPlayer
+            )
+        } else {
+            mShortVideoPlayer?.setDisplay(null)
+        }
+    }
+
+    private fun initStoryPlayer() {
+        if (mShortVideoPlayer != null) {
+            val old: IStoryPlayer? = mShortVideoPlayer
+            mShortVideoPlayer = null
+            old?.release()
+        }
+        val shortVideo = mShortVideos[mCurrentIndex]
+        val url = firstNonEmptyString(
+            shortVideo.mp4link2160, shortVideo.mp4link1440,
+            shortVideo.mp4link1080, shortVideo.mp4link720, shortVideo.mp4link480,
+            shortVideo.mp4link360, shortVideo.mp4link240
+        )
+        if (url == null) {
+            view?.showError(R.string.unable_to_play_file)
+            return
+        }
+        mShortVideoPlayer = storyPlayerFactory.createStoryPlayer(url, false)
+        mShortVideoPlayer?.addStatusChangeListener(this)
+        mShortVideoPlayer?.addVideoSizeChangeListener(this)
+        try {
+            mShortVideoPlayer?.play()
+        } catch (e: Exception) {
+            view?.showError(R.string.unable_to_play_file)
+        }
+    }
+
+    private fun selectPage(position: Int) {
+        if (mCurrentIndex == position) {
+            return
+        }
+        mCurrentIndex = position
+        initStoryPlayer()
+    }
+
+    private fun resolveAspectRatio() {
+        if (mShortVideoPlayer == null) {
+            return
+        }
+        val size = mShortVideoPlayer?.videoSize
+        if (size != null) {
+            view?.setAspectRatioAt(
+                mCurrentIndex,
+                size.width.coerceAtLeast(1),
+                size.height.coerceAtLeast(1)
+            )
+        } else {
+            view?.setAspectRatioAt(
+                mCurrentIndex,
+                1,
+                1
+            )
+        }
+    }
+
+    private fun resolvePreparingProgress() {
+        val preparing =
+            mShortVideoPlayer != null && mShortVideoPlayer?.playerStatus == IStoryPlayer.IStatus.PREPARING
+        view?.setPreparingProgressVisible(
+            mCurrentIndex,
+            preparing
+        )
+    }
+
+    private fun resolveToolbarSubtitle() {
+        if (mShortVideos.isEmpty()) {
+            return
+        }
+        view?.setToolbarSubtitle(
+            mShortVideos[mCurrentIndex],
+            accountId
+        )
+    }
+
+    fun firePageSelected(position: Int) {
+        if (mCurrentIndex == position) {
+            return
+        }
+        selectPage(position)
+        resolveToolbarTitle()
+        resolveToolbarSubtitle()
+        resolvePreparingProgress()
+        if (mCurrentIndex >= mShortVideos.size - 1 && !isEndContent && !loadingNow) {
+            receiveShortVideos()
+        }
+    }
+
+    fun fireHolderCreate(adapterPosition: Int) {
+        val isProgress =
+            adapterPosition == mCurrentIndex && (mShortVideoPlayer == null || mShortVideoPlayer?.playerStatus == IStoryPlayer.IStatus.PREPARING)
+        var size = if (mShortVideoPlayer == null) null else mShortVideoPlayer?.videoSize
+        if (size == null) {
+            size = DEF_SIZE
+        }
+        if (size.width <= 0) {
+            size.setWidth(1)
+        }
+        if (size.height <= 0) {
+            size.setHeight(1)
+        }
+        view?.configHolder(
+            adapterPosition,
+            isProgress,
+            size.width,
+            size.width
+        )
+    }
+
+    fun fireCommentsClick() {
+        if (mShortVideos.isEmpty()) {
+            return
+        }
+        mShortVideos[mCurrentIndex].let {
+            val commented = Commented.from(it)
+            view?.showComments(
+                accountId,
+                commented
+            )
+        }
+    }
+
+    private fun onLikesResponse(count: Int, userLikes: Boolean, index: Int) {
+        mShortVideos[index].let {
+            it.setLikesCount(count)
+            it.setUserLikes(userLikes)
+            view?.displayLikes(
+                count,
+                userLikes
+            )
+        }
+    }
+
+    private fun onLikeError(throwable: Throwable) {
+        showError(throwable)
+    }
+
+    fun fireLikeClick() {
+        if (mShortVideos.isEmpty()) {
+            return
+        }
+        mShortVideos[mCurrentIndex].let {
+            val add = !it.isUserLikes
+            appendDisposable(interactor.likeOrDislike(
+                accountId,
+                it.ownerId,
+                it.id,
+                it.accessKey,
+                add
+            )
+                .fromIOToMain()
+                .subscribe(
+                    { pair: Pair<Int, Boolean> ->
+                        onLikesResponse(
+                            pair.first,
+                            pair.second,
+                            mCurrentIndex
+                        )
+                    }
+                ) { throwable -> onLikeError(Utils.getCauseIfRuntime(throwable)) })
+        }
+    }
+
+    fun fireLikeLongClick() {
+        if (mShortVideos.isEmpty()) {
+            return
+        }
+        mShortVideos[mCurrentIndex].let {
+            view?.goToLikes(
+                accountId,
+                "video",
+                it.ownerId,
+                it.id
+            )
+        }
+    }
+
+    fun fireShareButtonClick() {
+        if (mShortVideos.isEmpty()) {
+            return
+        }
+        val shortVideo = mShortVideos[mCurrentIndex]
+        view?.onShare(shortVideo, accountId)
+    }
+
+    fun fireDownloadButtonClick() {
+        if (mShortVideos.isEmpty()) {
+            return
+        }
+        if (!hasReadWriteStoragePermission(instance)) {
+            view?.requestWriteExternalStoragePermission()
+            return
+        }
+        downloadImpl()
+    }
+
+    private fun onWritePermissionResolved() {
+        if (hasReadWriteStoragePermission(instance)) {
+            downloadImpl()
+        }
+    }
+
+    fun fireWritePermissionResolved() {
+        onWritePermissionResolved()
+    }
+
+    public override fun onGuiPaused() {
+        super.onGuiPaused()
+        mShortVideoPlayer?.pause()
+    }
+
+    public override fun onGuiResumed() {
+        super.onGuiResumed()
+        if (mShortVideoPlayer != null) {
+            try {
+                mShortVideoPlayer?.play()
+            } catch (e: Exception) {
+                e.printStackTrace()
+            }
+        }
+    }
+
+    override fun onDestroyed() {
+        if (mShortVideoPlayer != null) {
+            mShortVideoPlayer?.release()
+        }
+        super.onDestroyed()
+    }
+
+    private fun downloadImpl() {
+        val shortVideo = mShortVideos[mCurrentIndex]
+        val url = firstNonEmptyString(
+            shortVideo.mp4link2160, shortVideo.mp4link1440,
+            shortVideo.mp4link1080, shortVideo.mp4link720, shortVideo.mp4link480,
+            shortVideo.mp4link360, shortVideo.mp4link240
+        )
+        shortVideo.setTitle(shortVideo.optionalOwner?.fullName)
+        url.nonNullNoEmpty {
+            doDownloadVideo(context, shortVideo, it, "ShortVideo")
+        }
+    }
+
+    override fun onPlayerStatusChange(
+        player: IStoryPlayer,
+        previousStatus: Int,
+        currentStatus: Int
+    ) {
+        if (mShortVideoPlayer === player) {
+            if (currentStatus == IStoryPlayer.IStatus.ENDED) {
+                view?.onNext()
+                return
+            }
+            resolvePreparingProgress()
+            resolvePlayerDisplay()
+        }
+    }
+
+    override fun onVideoSizeChanged(player: IStoryPlayer, size: VideoSize) {
+        if (mShortVideoPlayer === player) {
+            resolveAspectRatio()
+        }
+    }
+
+    companion object {
+        private val DEF_SIZE = VideoSize(1, 1)
+    }
+
+    init {
+        receiveShortVideos()
+    }
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/storypager/StoryPagerActivity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/storypager/StoryPagerActivity.kt
index 2a62a5fdc..26012c9ff 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/storypager/StoryPagerActivity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/activity/storypager/StoryPagerActivity.kt
@@ -61,7 +61,7 @@ import dev.ragnarok.fenrir.view.pager.WeakPicassoLoadCallback
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
 import java.lang.ref.WeakReference
-import java.util.*
+import java.util.Calendar
 import java.util.concurrent.TimeUnit
 
 class StoryPagerActivity : BaseMvpActivity<StoryPagerPresenter, IStoryPagerView>(),
@@ -81,7 +81,7 @@ class StoryPagerActivity : BaseMvpActivity<StoryPagerPresenter, IStoryPagerView>
 
     @LayoutRes
     override fun getNoMainContentView(): Int {
-        return R.layout.fragment_story_pager
+        return R.layout.activity_story_pager
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/CaptchaProvider.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/CaptchaProvider.kt
index 4b254a4da..385da3e6c 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/CaptchaProvider.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/CaptchaProvider.kt
@@ -9,7 +9,7 @@ import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Scheduler
 import io.reactivex.rxjava3.subjects.PublishSubject
-import java.util.*
+import java.util.Collections
 
 class CaptchaProvider(private val app: Context, private val uiScheduler: Scheduler) :
     ICaptchaProvider {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/VKRestProvider.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/VKRestProvider.kt
index 32eadb455..8418492be 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/VKRestProvider.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/VKRestProvider.kt
@@ -7,7 +7,7 @@ import dev.ragnarok.fenrir.settings.IProxySettings
 import dev.ragnarok.fenrir.settings.Settings
 import io.reactivex.rxjava3.core.Single
 import okhttp3.OkHttpClient
-import java.util.*
+import java.util.Collections
 
 @SuppressLint("CheckResult")
 class VKRestProvider(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/ValidateProvider.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/ValidateProvider.kt
index f3252da38..aaa652004 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/ValidateProvider.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/ValidateProvider.kt
@@ -7,11 +7,10 @@ import dev.ragnarok.fenrir.Includes
 import dev.ragnarok.fenrir.activity.ValidateActivity
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Observable
-import io.reactivex.rxjava3.core.Scheduler
 import io.reactivex.rxjava3.subjects.PublishSubject
-import java.util.*
+import java.util.Collections
 
-class ValidateProvider(private val app: Context, private val uiScheduler: Scheduler) :
+class ValidateProvider(private val app: Context) :
     IValidateProvider {
     private val entryMap: MutableMap<String, Entry> = Collections.synchronizedMap(HashMap())
     private val cancelingNotifier: PublishSubject<String> = PublishSubject.create()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/CommunityDtoAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/CommunityDtoAdapter.kt
index f4cb3fd4f..f664ca373 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/CommunityDtoAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/CommunityDtoAdapter.kt
@@ -5,7 +5,7 @@ import dev.ragnarok.fenrir.api.model.*
 import dev.ragnarok.fenrir.api.util.VKStringUtils
 import dev.ragnarok.fenrir.kJson
 import dev.ragnarok.fenrir.util.serializeble.json.JsonElement
-import java.util.*
+import java.util.Locale
 import kotlin.math.abs
 
 class CommunityDtoAdapter : AbsAdapter<VKApiCommunity>("VKApiCommunity") {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/LongpollUpdateAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/LongpollUpdateAdapter.kt
index e58afb79b..86636a78d 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/LongpollUpdateAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/LongpollUpdateAdapter.kt
@@ -9,7 +9,7 @@ import dev.ragnarok.fenrir.model.Peer
 import dev.ragnarok.fenrir.nonNullNoEmpty
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.serializeble.json.*
-import java.util.*
+import java.util.Collections
 
 class LongpollUpdateAdapter : AbsAdapter<AbsLongpollEvent?>("AbsLongpollEvent?") {
     @Throws(Exception::class)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/ViewersListAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/ViewersListAdapter.kt
index cde429619..fc4374015 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/ViewersListAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/adapters/ViewersListAdapter.kt
@@ -20,7 +20,7 @@ class ViewersListAdapter : AbsAdapter<ViewersListResponse>("ViewersListAdapter")
         response.count = optInt(root, "count")
         if (hasArray(root, "items")) {
             val itemsArray = root.getAsJsonArray("items")
-            response.owners = ArrayList(itemsArray?.size.orZero())
+            response.ownersWithLikes = ArrayList(itemsArray?.size.orZero())
             for (i in 0 until itemsArray?.size.orZero()) {
                 if (!checkObject(itemsArray?.get(i))) {
                     continue
@@ -29,12 +29,13 @@ class ViewersListAdapter : AbsAdapter<ViewersListResponse>("ViewersListAdapter")
                 if (!hasObject(itemRoot, "user")) {
                     continue
                 }
+                val isLiked = optBoolean(itemRoot, "is_liked")
                 val userRoot = itemRoot["user"]
                 val owner = userRoot?.let {
                     kJson.decodeFromJsonElement(VKApiUser.serializer(), it)
                 }
                 owner.requireNonNull {
-                    response.owners?.add(it)
+                    response.ownersWithLikes?.add(Pair(it, isLiked))
                 }
             }
         }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/AbsApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/AbsApi.kt
index c3e0fd058..8487dcd87 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/AbsApi.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/AbsApi.kt
@@ -23,7 +23,7 @@ import io.reactivex.rxjava3.exceptions.Exceptions
 import io.reactivex.rxjava3.functions.Function
 import kotlinx.serialization.KSerializer
 import okhttp3.*
-import java.util.*
+import kotlin.random.Random
 
 internal open class AbsApi(val accountId: Long, private val restProvider: IServiceProvider) {
     fun <T : IServiceRest> provideService(serviceClass: T, vararg tokenTypes: Int): Single<T> {
@@ -259,7 +259,7 @@ internal open class AbsApi(val accountId: Long, private val restProvider: IServi
     }
 
     companion object {
-        val RANDOM = Random()
+        val RANDOM = Random(System.nanoTime())
         inline fun <reified T> join(
             tokens: Iterable<T>?,
             delimiter: String?,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/LikesApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/LikesApi.kt
index 659703c1a..cc14977b6 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/LikesApi.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/LikesApi.kt
@@ -1,12 +1,10 @@
 package dev.ragnarok.fenrir.api.impl
 
 import dev.ragnarok.fenrir.Constants
-import dev.ragnarok.fenrir.api.Fields
 import dev.ragnarok.fenrir.api.IServiceProvider
 import dev.ragnarok.fenrir.api.TokenType
 import dev.ragnarok.fenrir.api.interfaces.ILikesApi
 import dev.ragnarok.fenrir.api.model.response.LikesListResponse
-import dev.ragnarok.fenrir.api.model.response.ViewersListResponse
 import dev.ragnarok.fenrir.api.services.ILikesService
 import io.reactivex.rxjava3.core.Single
 
@@ -28,21 +26,6 @@ internal class LikesApi(accountId: Long, provider: IServiceProvider) :
             }
     }
 
-    override fun getStoriesViewers(
-        ownerId: Long?,
-        storyId: Int?,
-        offset: Int?, count: Int?
-    ): Single<ViewersListResponse> {
-        return provideService(ILikesService(), TokenType.USER, TokenType.SERVICE)
-            .flatMap { service ->
-                service
-                    .getStoriesViewers(
-                        ownerId, storyId, offset, count, 1, Fields.FIELDS_BASE_USER
-                    )
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
     override fun delete(
         type: String?,
         ownerId: Long?,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/StoriesShortVideosApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/StoriesShortVideosApi.kt
new file mode 100644
index 000000000..f33a83c02
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/StoriesShortVideosApi.kt
@@ -0,0 +1,154 @@
+package dev.ragnarok.fenrir.api.impl
+
+import dev.ragnarok.fenrir.api.Fields
+import dev.ragnarok.fenrir.api.IServiceProvider
+import dev.ragnarok.fenrir.api.TokenType
+import dev.ragnarok.fenrir.api.interfaces.IStoriesShortVideosApi
+import dev.ragnarok.fenrir.api.model.AccessIdPair
+import dev.ragnarok.fenrir.api.model.Items
+import dev.ragnarok.fenrir.api.model.VKApiNarratives
+import dev.ragnarok.fenrir.api.model.VKApiStory
+import dev.ragnarok.fenrir.api.model.response.ShortVideosResponse
+import dev.ragnarok.fenrir.api.model.response.StoryGetResponse
+import dev.ragnarok.fenrir.api.model.response.StoryResponse
+import dev.ragnarok.fenrir.api.model.response.ViewersListResponse
+import dev.ragnarok.fenrir.api.model.server.VKApiStoryUploadServer
+import dev.ragnarok.fenrir.api.services.IStoriesShortVideosService
+import io.reactivex.rxjava3.core.Single
+
+internal class StoriesShortVideosApi(accountId: Long, provider: IServiceProvider) :
+    AbsApi(accountId, provider), IStoriesShortVideosApi {
+
+    override fun getStory(owner_id: Long?, extended: Int?, fields: String?): Single<StoryResponse> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.getStory(owner_id, extended, fields)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun getNarratives(
+        owner_id: Long,
+        offset: Int?,
+        count: Int?
+    ): Single<Items<VKApiNarratives>> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.getNarratives(owner_id, offset, count)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun getStoryById(
+        stories: List<AccessIdPair>,
+        extended: Int?,
+        fields: String?
+    ): Single<StoryGetResponse> {
+        val storyString = join(stories, ",") { AccessIdPair.format(it) }
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.getStoryById(storyString, extended, fields)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun getStoriesViewers(
+        ownerId: Long?,
+        storyId: Int?,
+        offset: Int?, count: Int?
+    ): Single<ViewersListResponse> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.SERVICE)
+            .flatMap { service ->
+                service
+                    .getStoriesViewers(
+                        ownerId, storyId, offset, count, 1, Fields.FIELDS_BASE_USER
+                    )
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun searchStory(
+        q: String?,
+        mentioned_id: Long?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<StoryResponse> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.searchStory(q, mentioned_id, count, extended, fields)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun stories_delete(owner_id: Long, story_id: Int): Single<Int> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.stories_delete(owner_id, story_id)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun stories_getPhotoUploadServer(
+        group_id: Long?,
+        reply_to_story: String?
+    ): Single<VKApiStoryUploadServer> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.stories_getPhotoUploadServer(1, group_id, reply_to_story)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun stories_getVideoUploadServer(
+        group_id: Long?,
+        reply_to_story: String?
+    ): Single<VKApiStoryUploadServer> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.stories_getVideoUploadServer(1, group_id, reply_to_story)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun stories_save(upload_results: String?): Single<Items<VKApiStory>> {
+        return provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+            .flatMap { service ->
+                service.stories_save(upload_results)
+                    .map(extractResponseWithErrorHandling())
+            }
+    }
+
+    override fun getShortVideos(
+        ownerId: Long?,
+        startFrom: String?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<ShortVideosResponse> {
+        return if (ownerId != null) {
+            provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+                .flatMap { service ->
+                    service.getOwnerShortVideos(
+                        ownerId,
+                        startFrom,
+                        count,
+                        extended,
+                        fields
+                    )
+                        .map(extractResponseWithErrorHandling())
+                }
+        } else {
+            provideService(IStoriesShortVideosService(), TokenType.USER, TokenType.COMMUNITY)
+                .flatMap { service ->
+                    service.getTopShortVideos(
+                        startFrom,
+                        count,
+                        extended,
+                        fields
+                    )
+                        .map(extractResponseWithErrorHandling())
+                }
+        }
+    }
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UploadApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UploadApi.kt
index 988cb9254..cfe721b64 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UploadApi.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UploadApi.kt
@@ -4,6 +4,7 @@ import dev.ragnarok.fenrir.api.IUploadRestProvider
 import dev.ragnarok.fenrir.api.PercentagePublisher
 import dev.ragnarok.fenrir.api.interfaces.IUploadApi
 import dev.ragnarok.fenrir.api.model.response.BaseResponse
+import dev.ragnarok.fenrir.api.model.response.CustomResponse
 import dev.ragnarok.fenrir.api.model.upload.UploadAudioDto
 import dev.ragnarok.fenrir.api.model.upload.UploadChatPhotoDto
 import dev.ragnarok.fenrir.api.model.upload.UploadDocDto
@@ -78,7 +79,7 @@ class UploadApi internal constructor(private val provider: IUploadRestProvider)
         inputStream: InputStream,
         listener: PercentagePublisher?,
         isVideo: Boolean
-    ): Single<BaseResponse<UploadStoryDto>> {
+    ): Single<CustomResponse<UploadStoryDto>> {
         val body = ProgressRequestBody(
             inputStream, wrapPercentageListener(listener),
             "*/*".toMediaTypeOrNull()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UsersApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UsersApi.kt
index adc382b74..97ce69441 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UsersApi.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/UsersApi.kt
@@ -4,16 +4,10 @@ import dev.ragnarok.fenrir.Constants
 import dev.ragnarok.fenrir.api.IServiceProvider
 import dev.ragnarok.fenrir.api.TokenType
 import dev.ragnarok.fenrir.api.interfaces.IUsersApi
-import dev.ragnarok.fenrir.api.model.AccessIdPair
 import dev.ragnarok.fenrir.api.model.Items
 import dev.ragnarok.fenrir.api.model.VKApiGift
-import dev.ragnarok.fenrir.api.model.VKApiNarratives
-import dev.ragnarok.fenrir.api.model.VKApiStory
 import dev.ragnarok.fenrir.api.model.VKApiUser
-import dev.ragnarok.fenrir.api.model.response.StoryGetResponse
-import dev.ragnarok.fenrir.api.model.response.StoryResponse
 import dev.ragnarok.fenrir.api.model.response.UserWallInfoResponse
-import dev.ragnarok.fenrir.api.model.server.VKApiStoryUploadServer
 import dev.ragnarok.fenrir.api.services.IUsersService
 import dev.ragnarok.fenrir.exception.NotFoundException
 import dev.ragnarok.fenrir.requireNonNull
@@ -189,39 +183,6 @@ internal class UsersApi(accountId: Long, provider: IServiceProvider) :
             }
     }
 
-    override fun getStory(owner_id: Long?, extended: Int?, fields: String?): Single<StoryResponse> {
-        return provideService(IUsersService(), TokenType.USER, TokenType.COMMUNITY)
-            .flatMap { service ->
-                service.getStory(owner_id, extended, fields)
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
-    override fun getNarratives(
-        owner_id: Long,
-        offset: Int?,
-        count: Int?
-    ): Single<Items<VKApiNarratives>> {
-        return provideService(IUsersService(), TokenType.USER, TokenType.COMMUNITY)
-            .flatMap { service ->
-                service.getNarratives(owner_id, offset, count)
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
-    override fun getStoryById(
-        stories: List<AccessIdPair>,
-        extended: Int?,
-        fields: String?
-    ): Single<StoryGetResponse> {
-        val storyString = join(stories, ",") { AccessIdPair.format(it) }
-        return provideService(IUsersService(), TokenType.USER, TokenType.COMMUNITY)
-            .flatMap { service ->
-                service.getStoryById(storyString, extended, fields)
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
     override fun getGifts(user_id: Long?, count: Int?, offset: Int?): Single<Items<VKApiGift>> {
         return provideService(IUsersService(), TokenType.USER)
             .flatMap { service ->
@@ -230,20 +191,6 @@ internal class UsersApi(accountId: Long, provider: IServiceProvider) :
             }
     }
 
-    override fun searchStory(
-        q: String?,
-        mentioned_id: Long?,
-        count: Int?,
-        extended: Int?,
-        fields: String?
-    ): Single<StoryResponse> {
-        return provideService(IUsersService(), TokenType.USER, TokenType.COMMUNITY)
-            .flatMap { service ->
-                service.searchStory(q, mentioned_id, count, extended, fields)
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
     override fun get(
         userIds: Collection<Long>?,
         domains: Collection<String>?,
@@ -269,30 +216,6 @@ internal class UsersApi(accountId: Long, provider: IServiceProvider) :
             }
     }
 
-    override fun stories_getPhotoUploadServer(): Single<VKApiStoryUploadServer> {
-        return provideService(IUsersService(), TokenType.USER, TokenType.COMMUNITY)
-            .flatMap { service ->
-                service.stories_getPhotoUploadServer(1)
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
-    override fun stories_getVideoUploadServer(): Single<VKApiStoryUploadServer> {
-        return provideService(IUsersService(), TokenType.USER, TokenType.COMMUNITY)
-            .flatMap { service ->
-                service.stories_getVideoUploadServer(1)
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
-    override fun stories_save(upload_results: String?): Single<Items<VKApiStory>> {
-        return provideService(IUsersService(), TokenType.USER, TokenType.COMMUNITY)
-            .flatMap { service ->
-                service.stories_save(upload_results)
-                    .map(extractResponseWithErrorHandling())
-            }
-    }
-
     companion object {
         internal fun createFrom(response: UserWallInfoResponse): VKApiUser {
             val user = response.users?.get(0) ?: throw NotFoundException()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/VKApies.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/VKApies.kt
index 49dd042f8..03b146335 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/VKApies.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/impl/VKApies.kt
@@ -38,6 +38,7 @@ internal class VKApies private constructor(
     private val faveApi: IFaveApi
     private val pollsApi: IPollsApi
     private val utilsApi: IUtilsApi
+    private val storiesApi: IStoriesShortVideosApi
     private val otherApi: IOtherApi
     override fun messages(): IMessagesApi {
         return messagesApi
@@ -107,6 +108,10 @@ internal class VKApies private constructor(
         return likesApi
     }
 
+    override fun stories(): IStoriesShortVideosApi {
+        return storiesApi
+    }
+
     override fun pages(): IPagesApi {
         return pagesApi
     }
@@ -231,6 +236,7 @@ internal class VKApies private constructor(
         utilsApi = UtilsApi(accountId, restProvider)
         videoApi = VideoApi(accountId, restProvider)
         wallApi = WallApi(accountId, restProvider)
+        storiesApi = StoriesShortVideosApi(accountId, restProvider)
         otherApi = OtherApi(accountId, provider)
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IAccountApis.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IAccountApis.kt
index 1757ca8b0..99140b4af 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IAccountApis.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IAccountApis.kt
@@ -18,6 +18,7 @@ interface IAccountApis {
     fun audio(): IAudioApi
     fun status(): IStatusApi
     fun likes(): ILikesApi
+    fun stories(): IStoriesShortVideosApi
     fun pages(): IPagesApi
     fun store(): IStoreApi
     fun fave(): IFaveApi
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/ILikesApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/ILikesApi.kt
index 7992982bc..41282396c 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/ILikesApi.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/ILikesApi.kt
@@ -2,7 +2,6 @@ package dev.ragnarok.fenrir.api.interfaces
 
 import androidx.annotation.CheckResult
 import dev.ragnarok.fenrir.api.model.response.LikesListResponse
-import dev.ragnarok.fenrir.api.model.response.ViewersListResponse
 import io.reactivex.rxjava3.core.Single
 
 interface ILikesApi {
@@ -12,14 +11,6 @@ interface ILikesApi {
         friendsOnly: Boolean?, offset: Int?, count: Int?, skipOwn: Boolean?, fields: String?
     ): Single<LikesListResponse>
 
-    @CheckResult
-    fun getStoriesViewers(
-        ownerId: Long?,
-        storyId: Int?,
-        offset: Int?,
-        count: Int?
-    ): Single<ViewersListResponse>
-
     @CheckResult
     fun delete(type: String?, ownerId: Long?, itemId: Int, accessKey: String?): Single<Int>
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IStoriesShortVideosApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IStoriesShortVideosApi.kt
new file mode 100644
index 000000000..45a2ee2ca
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IStoriesShortVideosApi.kt
@@ -0,0 +1,72 @@
+package dev.ragnarok.fenrir.api.interfaces
+
+import androidx.annotation.CheckResult
+import dev.ragnarok.fenrir.api.model.AccessIdPair
+import dev.ragnarok.fenrir.api.model.Items
+import dev.ragnarok.fenrir.api.model.VKApiNarratives
+import dev.ragnarok.fenrir.api.model.VKApiStory
+import dev.ragnarok.fenrir.api.model.response.ShortVideosResponse
+import dev.ragnarok.fenrir.api.model.response.StoryGetResponse
+import dev.ragnarok.fenrir.api.model.response.StoryResponse
+import dev.ragnarok.fenrir.api.model.response.ViewersListResponse
+import dev.ragnarok.fenrir.api.model.server.VKApiStoryUploadServer
+import io.reactivex.rxjava3.core.Single
+
+interface IStoriesShortVideosApi {
+    @CheckResult
+    fun stories_getPhotoUploadServer(
+        group_id: Long?,
+        reply_to_story: String?
+    ): Single<VKApiStoryUploadServer>
+
+    @CheckResult
+    fun stories_getVideoUploadServer(
+        group_id: Long?,
+        reply_to_story: String?
+    ): Single<VKApiStoryUploadServer>
+
+    @CheckResult
+    fun getStoriesViewers(
+        ownerId: Long?,
+        storyId: Int?,
+        offset: Int?,
+        count: Int?
+    ): Single<ViewersListResponse>
+
+    @CheckResult
+    fun stories_delete(owner_id: Long, story_id: Int): Single<Int>
+
+    @CheckResult
+    fun stories_save(upload_results: String?): Single<Items<VKApiStory>>
+
+    @CheckResult
+    fun getStory(owner_id: Long?, extended: Int?, fields: String?): Single<StoryResponse>
+
+    @CheckResult
+    fun getNarratives(owner_id: Long, offset: Int?, count: Int?): Single<Items<VKApiNarratives>>
+
+    @CheckResult
+    fun getStoryById(
+        stories: List<AccessIdPair>,
+        extended: Int?,
+        fields: String?
+    ): Single<StoryGetResponse>
+
+    @CheckResult
+    fun searchStory(
+        q: String?,
+        mentioned_id: Long?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<StoryResponse>
+
+    @CheckResult
+    fun getShortVideos(
+        ownerId: Long?,
+        startFrom: String?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<ShortVideosResponse>
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUploadApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUploadApi.kt
index 79e231fae..816839053 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUploadApi.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUploadApi.kt
@@ -2,6 +2,7 @@ package dev.ragnarok.fenrir.api.interfaces
 
 import dev.ragnarok.fenrir.api.PercentagePublisher
 import dev.ragnarok.fenrir.api.model.response.BaseResponse
+import dev.ragnarok.fenrir.api.model.response.CustomResponse
 import dev.ragnarok.fenrir.api.model.upload.UploadAudioDto
 import dev.ragnarok.fenrir.api.model.upload.UploadChatPhotoDto
 import dev.ragnarok.fenrir.api.model.upload.UploadDocDto
@@ -42,7 +43,7 @@ interface IUploadApi {
         inputStream: InputStream,
         listener: PercentagePublisher?,
         isVideo: Boolean
-    ): Single<BaseResponse<UploadStoryDto>>
+    ): Single<CustomResponse<UploadStoryDto>>
 
     fun uploadVideoRx(
         server: String,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUsersApi.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUsersApi.kt
index ab4d2f46b..49919990d 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUsersApi.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/interfaces/IUsersApi.kt
@@ -1,15 +1,9 @@
 package dev.ragnarok.fenrir.api.interfaces
 
 import androidx.annotation.CheckResult
-import dev.ragnarok.fenrir.api.model.AccessIdPair
 import dev.ragnarok.fenrir.api.model.Items
 import dev.ragnarok.fenrir.api.model.VKApiGift
-import dev.ragnarok.fenrir.api.model.VKApiNarratives
-import dev.ragnarok.fenrir.api.model.VKApiStory
 import dev.ragnarok.fenrir.api.model.VKApiUser
-import dev.ragnarok.fenrir.api.model.response.StoryGetResponse
-import dev.ragnarok.fenrir.api.model.response.StoryResponse
-import dev.ragnarok.fenrir.api.model.server.VKApiStoryUploadServer
 import io.reactivex.rxjava3.core.Single
 
 interface IUsersApi {
@@ -51,43 +45,12 @@ interface IUsersApi {
         fields: String?, nameCase: String?
     ): Single<List<VKApiUser>>
 
-    @CheckResult
-    fun stories_getPhotoUploadServer(): Single<VKApiStoryUploadServer>
-
-    @CheckResult
-    fun stories_getVideoUploadServer(): Single<VKApiStoryUploadServer>
-
-    @CheckResult
-    fun stories_save(upload_results: String?): Single<Items<VKApiStory>>
-
-    @CheckResult
-    fun getStory(owner_id: Long?, extended: Int?, fields: String?): Single<StoryResponse>
-
-    @CheckResult
-    fun getNarratives(owner_id: Long, offset: Int?, count: Int?): Single<Items<VKApiNarratives>>
-
-    @CheckResult
-    fun getStoryById(
-        stories: List<AccessIdPair>,
-        extended: Int?,
-        fields: String?
-    ): Single<StoryGetResponse>
-
     @CheckResult
     fun checkAndAddFriend(userId: Long?): Single<Int>
 
     @CheckResult
     fun getGifts(user_id: Long?, count: Int?, offset: Int?): Single<Items<VKApiGift>>
 
-    @CheckResult
-    fun searchStory(
-        q: String?,
-        mentioned_id: Long?,
-        count: Int?,
-        extended: Int?,
-        fields: String?
-    ): Single<StoryResponse>
-
     @CheckResult
     fun report(userId: Long?, type: String?, comment: String?): Single<Int>
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiCommunity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiCommunity.kt
index 2a9cb9e8e..d6f01b112 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiCommunity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiCommunity.kt
@@ -278,6 +278,7 @@ class VKApiCommunity
         var market = NO_COUNTER
         var market_services = NO_COUNTER
         var narratives = NO_COUNTER
+        var clips = NO_COUNTER
         var chats = NO_COUNTER
         var all_wall = NO_COUNTER
         var owner_wall = NO_COUNTER
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiUser.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiUser.kt
index 10b88e7dd..ac6f25d82 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiUser.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/VKApiUser.kt
@@ -475,6 +475,7 @@ class VKApiUser
         var market = NO_COUNTER
         var market_services = NO_COUNTER
         var narratives = NO_COUNTER
+        var clips = NO_COUNTER
         var gifts = NO_COUNTER
 
         companion object {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/CustomResponse.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/CustomResponse.kt
new file mode 100644
index 000000000..4e37aee66
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/CustomResponse.kt
@@ -0,0 +1,12 @@
+package dev.ragnarok.fenrir.api.model.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+class CustomResponse<T> {
+    @SerialName("response")
+    var response: T? = null
+    var error: String? = null
+    var error_code: Int? = null
+}
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/ShortVideosResponse.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/ShortVideosResponse.kt
new file mode 100644
index 000000000..58d7c83ce
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/ShortVideosResponse.kt
@@ -0,0 +1,20 @@
+package dev.ragnarok.fenrir.api.model.response
+
+import dev.ragnarok.fenrir.api.model.*
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+class ShortVideosResponse {
+    @SerialName("items")
+    var items: List<VKApiVideo>? = null
+
+    @SerialName("profiles")
+    var profiles: List<VKApiUser>? = null
+
+    @SerialName("groups")
+    var groups: List<VKApiCommunity>? = null
+
+    @SerialName("next_from")
+    var nextFrom: String? = null
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/ViewersListResponse.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/ViewersListResponse.kt
index 0d0f6f9c9..aad5c725b 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/ViewersListResponse.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/model/response/ViewersListResponse.kt
@@ -7,5 +7,5 @@ import kotlinx.serialization.Serializable
 @Serializable(with = ViewersListAdapter::class)
 class ViewersListResponse {
     var count = 0
-    var owners: ArrayList<VKApiOwner>? = null
+    var ownersWithLikes: ArrayList<Pair<VKApiOwner, Boolean>>? = null
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/ILikesService.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/ILikesService.kt
index 9aa7b9f25..42ffad462 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/ILikesService.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/ILikesService.kt
@@ -3,7 +3,6 @@ package dev.ragnarok.fenrir.api.services
 import dev.ragnarok.fenrir.api.model.response.BaseResponse
 import dev.ragnarok.fenrir.api.model.response.LikeResponse
 import dev.ragnarok.fenrir.api.model.response.LikesListResponse
-import dev.ragnarok.fenrir.api.model.response.ViewersListResponse
 import dev.ragnarok.fenrir.api.model.response.isLikeResponse
 import dev.ragnarok.fenrir.api.rest.IServiceRest
 import io.reactivex.rxjava3.core.Single
@@ -40,26 +39,6 @@ class ILikesService : IServiceRest() {
         )
     }
 
-    fun getStoriesViewers(
-        ownerId: Long?,
-        storyId: Int?,
-        offset: Int?,
-        count: Int?,
-        extended: Int?,
-        fields: String?
-    ): Single<BaseResponse<ViewersListResponse>> {
-        return rest.request(
-            "stories.getViewers", form(
-                "owner_id" to ownerId,
-                "story_id" to storyId,
-                "offset" to offset,
-                "count" to count,
-                "extended" to extended,
-                "fields" to fields
-            ), base(ViewersListResponse.serializer())
-        )
-    }
-
     //https://vk.com/dev/likes.delete
     fun delete(
         type: String?,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IStoriesShortVideosService.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IStoriesShortVideosService.kt
new file mode 100644
index 000000000..4e7af1ded
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IStoriesShortVideosService.kt
@@ -0,0 +1,178 @@
+package dev.ragnarok.fenrir.api.services
+
+import dev.ragnarok.fenrir.api.model.Items
+import dev.ragnarok.fenrir.api.model.VKApiNarratives
+import dev.ragnarok.fenrir.api.model.VKApiStory
+import dev.ragnarok.fenrir.api.model.response.BaseResponse
+import dev.ragnarok.fenrir.api.model.response.ShortVideosResponse
+import dev.ragnarok.fenrir.api.model.response.StoryGetResponse
+import dev.ragnarok.fenrir.api.model.response.StoryResponse
+import dev.ragnarok.fenrir.api.model.response.ViewersListResponse
+import dev.ragnarok.fenrir.api.model.server.VKApiStoryUploadServer
+import dev.ragnarok.fenrir.api.rest.IServiceRest
+import io.reactivex.rxjava3.core.Single
+
+class IStoriesShortVideosService : IServiceRest() {
+    fun stories_getPhotoUploadServer(
+        add_to_news: Int?,
+        group_id: Long?,
+        reply_to_story: String?
+    ): Single<BaseResponse<VKApiStoryUploadServer>> {
+        return rest.request(
+            "stories.getPhotoUploadServer",
+            form(
+                "add_to_news" to add_to_news,
+                "reply_to_story" to reply_to_story,
+                "group_id" to group_id
+            ),
+            base(VKApiStoryUploadServer.serializer())
+        )
+    }
+
+    fun stories_getVideoUploadServer(
+        add_to_news: Int?,
+        group_id: Long?,
+        reply_to_story: String?
+    ): Single<BaseResponse<VKApiStoryUploadServer>> {
+        return rest.request(
+            "stories.getVideoUploadServer",
+            form(
+                "add_to_news" to add_to_news,
+                "reply_to_story" to reply_to_story,
+                "group_id" to group_id
+            ),
+            base(VKApiStoryUploadServer.serializer())
+        )
+    }
+
+    fun getStoriesViewers(
+        ownerId: Long?,
+        storyId: Int?,
+        offset: Int?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<BaseResponse<ViewersListResponse>> {
+        return rest.request(
+            "stories.getViewers", form(
+                "owner_id" to ownerId,
+                "story_id" to storyId,
+                "offset" to offset,
+                "count" to count,
+                "extended" to extended,
+                "fields" to fields
+            ), base(ViewersListResponse.serializer())
+        )
+    }
+
+    fun stories_save(upload_results: String?): Single<BaseResponse<Items<VKApiStory>>> {
+        return rest.request(
+            "stories.save",
+            form("upload_results" to upload_results),
+            items(VKApiStory.serializer())
+        )
+    }
+
+    fun stories_delete(owner_id: Long, story_id: Int): Single<BaseResponse<Int>> {
+        return rest.request(
+            "stories.delete", form(
+                "owner_id" to owner_id,
+                "story_id" to story_id
+            ), baseInt
+        )
+    }
+
+    fun getStory(
+        owner_id: Long?,
+        extended: Int?,
+        fields: String?
+    ): Single<BaseResponse<StoryResponse>> {
+        return rest.request(
+            "stories.get", form(
+                "owner_id" to owner_id,
+                "extended" to extended,
+                "fields" to fields
+            ), base(StoryResponse.serializer())
+        )
+    }
+
+    fun getNarratives(
+        owner_id: Long,
+        offset: Int?,
+        count: Int?
+    ): Single<BaseResponse<Items<VKApiNarratives>>> {
+        return rest.request(
+            "narratives.getFromOwner", form(
+                "owner_id" to owner_id,
+                "offset" to offset,
+                "count" to count
+            ), items(VKApiNarratives.serializer())
+        )
+    }
+
+    fun getStoryById(
+        stories: String?,
+        extended: Int?,
+        fields: String?
+    ): Single<BaseResponse<StoryGetResponse>> {
+        return rest.request(
+            "stories.getById", form(
+                "stories" to stories,
+                "extended" to extended,
+                "fields" to fields
+            ), base(StoryGetResponse.serializer())
+        )
+    }
+
+    fun searchStory(
+        q: String?,
+        mentioned_id: Long?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<BaseResponse<StoryResponse>> {
+        return rest.request(
+            "stories.search", form(
+                "q" to q,
+                "mentioned_id" to mentioned_id,
+                "count" to count,
+                "extended" to extended,
+                "fields" to fields
+            ), base(StoryResponse.serializer())
+        )
+    }
+
+    fun getTopShortVideos(
+        startFrom: String?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<BaseResponse<ShortVideosResponse>> {
+        return rest.request(
+            "shortVideo.getTopVideos", form(
+                "start_from" to startFrom,
+                "count" to count,
+                "extended" to extended,
+                "fields" to fields
+            ), base(ShortVideosResponse.serializer())
+        )
+    }
+
+    fun getOwnerShortVideos(
+        ownerId: Long?,
+        startFrom: String?,
+        count: Int?,
+        extended: Int?,
+        fields: String?
+    ): Single<BaseResponse<ShortVideosResponse>> {
+        return rest.request(
+            "shortVideo.getOwnerVideos", form(
+                "owner_id" to ownerId,
+                "start_from" to startFrom,
+                "count" to count,
+                "extended" to extended,
+                "fields" to fields
+            ), base(ShortVideosResponse.serializer())
+        )
+    }
+}
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUploadService.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUploadService.kt
index bf3e51f02..2aeab1db4 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUploadService.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUploadService.kt
@@ -1,6 +1,7 @@
 package dev.ragnarok.fenrir.api.services
 
 import dev.ragnarok.fenrir.api.model.response.BaseResponse
+import dev.ragnarok.fenrir.api.model.response.CustomResponse
 import dev.ragnarok.fenrir.api.model.upload.UploadAudioDto
 import dev.ragnarok.fenrir.api.model.upload.UploadChatPhotoDto
 import dev.ragnarok.fenrir.api.model.upload.UploadDocDto
@@ -33,8 +34,12 @@ class IUploadService : IServiceRest() {
     fun uploadStoryRx(
         server: String,
         file: MultipartBody.Part
-    ): Single<BaseResponse<UploadStoryDto>> {
-        return rest.doMultipartFormFullUrl(server, file, base(UploadStoryDto.serializer()))
+    ): Single<CustomResponse<UploadStoryDto>> {
+        return rest.doMultipartFormFullUrl(
+            server,
+            file,
+            CustomResponse.serializer(UploadStoryDto.serializer())
+        )
     }
 
     fun uploadVideoRx(server: String, file: MultipartBody.Part): Single<UploadVideoDto> {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUsersService.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUsersService.kt
index 921d825cf..d666f56d3 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUsersService.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/api/services/IUsersService.kt
@@ -2,14 +2,9 @@ package dev.ragnarok.fenrir.api.services
 
 import dev.ragnarok.fenrir.api.model.Items
 import dev.ragnarok.fenrir.api.model.VKApiGift
-import dev.ragnarok.fenrir.api.model.VKApiNarratives
-import dev.ragnarok.fenrir.api.model.VKApiStory
 import dev.ragnarok.fenrir.api.model.VKApiUser
 import dev.ragnarok.fenrir.api.model.response.BaseResponse
-import dev.ragnarok.fenrir.api.model.response.StoryGetResponse
-import dev.ragnarok.fenrir.api.model.response.StoryResponse
 import dev.ragnarok.fenrir.api.model.response.UserWallInfoResponse
-import dev.ragnarok.fenrir.api.model.server.VKApiStoryUploadServer
 import dev.ragnarok.fenrir.api.rest.IServiceRest
 import io.reactivex.rxjava3.core.Single
 
@@ -172,30 +167,6 @@ class IUsersService : IServiceRest() {
         )
     }
 
-    fun stories_getPhotoUploadServer(add_to_news: Int?): Single<BaseResponse<VKApiStoryUploadServer>> {
-        return rest.request(
-            "stories.getPhotoUploadServer",
-            form("add_to_news" to add_to_news),
-            base(VKApiStoryUploadServer.serializer())
-        )
-    }
-
-    fun stories_getVideoUploadServer(add_to_news: Int?): Single<BaseResponse<VKApiStoryUploadServer>> {
-        return rest.request(
-            "stories.getVideoUploadServer",
-            form("add_to_news" to add_to_news),
-            base(VKApiStoryUploadServer.serializer())
-        )
-    }
-
-    fun stories_save(upload_results: String?): Single<BaseResponse<Items<VKApiStory>>> {
-        return rest.request(
-            "stories.save",
-            form("upload_results" to upload_results),
-            items(VKApiStory.serializer())
-        )
-    }
-
     fun report(
         userId: Long?,
         type: String?,
@@ -210,48 +181,6 @@ class IUsersService : IServiceRest() {
         )
     }
 
-    fun getStory(
-        owner_id: Long?,
-        extended: Int?,
-        fields: String?
-    ): Single<BaseResponse<StoryResponse>> {
-        return rest.request(
-            "stories.get", form(
-                "owner_id" to owner_id,
-                "extended" to extended,
-                "fields" to fields
-            ), base(StoryResponse.serializer())
-        )
-    }
-
-    fun getNarratives(
-        owner_id: Long,
-        offset: Int?,
-        count: Int?
-    ): Single<BaseResponse<Items<VKApiNarratives>>> {
-        return rest.request(
-            "narratives.getFromOwner", form(
-                "owner_id" to owner_id,
-                "offset" to offset,
-                "count" to count
-            ), items(VKApiNarratives.serializer())
-        )
-    }
-
-    fun getStoryById(
-        stories: String?,
-        extended: Int?,
-        fields: String?
-    ): Single<BaseResponse<StoryGetResponse>> {
-        return rest.request(
-            "stories.getById", form(
-                "stories" to stories,
-                "extended" to extended,
-                "fields" to fields
-            ), base(StoryGetResponse.serializer())
-        )
-    }
-
     fun getGifts(
         user_id: Long?,
         count: Int?,
@@ -266,24 +195,6 @@ class IUsersService : IServiceRest() {
         )
     }
 
-    fun searchStory(
-        q: String?,
-        mentioned_id: Long?,
-        count: Int?,
-        extended: Int?,
-        fields: String?
-    ): Single<BaseResponse<StoryResponse>> {
-        return rest.request(
-            "stories.search", form(
-                "q" to q,
-                "mentioned_id" to mentioned_id,
-                "count" to count,
-                "extended" to extended,
-                "fields" to fields
-            ), base(StoryResponse.serializer())
-        )
-    }
-
     fun checkAndAddFriend(
         code: String?,
         user_id: Long?
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/crypt/KeyExchangeService.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/crypt/KeyExchangeService.kt
index f934eadb8..256f2b36c 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/crypt/KeyExchangeService.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/crypt/KeyExchangeService.kt
@@ -42,11 +42,11 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import java.security.InvalidKeyException
 import java.security.NoSuchAlgorithmException
 import java.security.spec.InvalidKeySpecException
-import java.util.*
 import java.util.concurrent.TimeUnit
 import javax.crypto.BadPaddingException
 import javax.crypto.IllegalBlockSizeException
 import javax.crypto.NoSuchPaddingException
+import kotlin.random.Random
 
 class KeyExchangeService : Service() {
     private val mUtilsInteractor: IUtilsInteractor = InteractorFactory.createUtilsInteractor()
@@ -809,7 +809,7 @@ class KeyExchangeService : Service() {
                         .vkDefault(accountId)
                         .messages()
                         .send(
-                            Random().nextInt().toLong(),
+                            Random(System.nanoTime()).nextLong(),
                             peerId,
                             null,
                             message.toString(),
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/DBHelper.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/DBHelper.kt
index 4d65b44b8..4a4f5a2b5 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/DBHelper.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/DBHelper.kt
@@ -86,7 +86,6 @@ class DBHelper private constructor(context: Context, aid: Long) :
     override fun onCreate(db: SQLiteDatabase) {
         createUsersTable(db)
         createMessagesTable(db)
-        createZeroMessageProtectionTriggers(db)
         createAttachmentsTable(db)
         createDialogTable(db)
         createPeersTable(db)
@@ -118,16 +117,22 @@ class DBHelper private constructor(context: Context, aid: Long) :
         createCountriesTable(db)
         createFeedListsTable(db)
         createFriendListsTable(db)
-        //createDeleteWallCopyHistoryTrigger(db)
         createKeysTableIfNotExist(db)
+
+        createZeroMessageProtectionTriggers(db)
+        //createAttachmentsTriggers(db)
     }
 
     private fun dropAllTables(db: SQLiteDatabase) {
         db.beginTransaction()
 
         // сначала удаляем триггеры, потому что они зависят от таблиц
-        //db.execSQL("DROP TRIGGER IF EXISTS t_delete_wall_copy_history");
-        //db.execSQL("DROP TRIGGER IF EXISTS t_delete_feed_copy_history");
+        //db.execSQL("DROP TRIGGER IF EXISTS t_delete_attachments_wall")
+        //db.execSQL("DROP TRIGGER IF EXISTS t_delete_attachments_messages")
+        //db.execSQL("DROP TRIGGER IF EXISTS t_delete_attachments_comments")
+        db.execSQL("DROP TRIGGER IF EXISTS zero_msg_upd")
+        db.execSQL("DROP TRIGGER IF EXISTS zero_msg_del")
+
         db.execSQL("DROP TABLE IF EXISTS " + MessagesAttachmentsColumns.TABLENAME)
         db.execSQL("DROP TABLE IF EXISTS " + CommentsAttachmentsColumns.TABLENAME)
         db.execSQL("DROP TABLE IF EXISTS " + CommentsColumns.TABLENAME)
@@ -136,10 +141,6 @@ class DBHelper private constructor(context: Context, aid: Long) :
         db.execSQL("DROP TABLE IF EXISTS " + DocColumns.TABLENAME)
         db.execSQL("DROP TABLE IF EXISTS " + GroupColumns.TABLENAME)
         db.execSQL("DROP TABLE IF EXISTS " + GroupsDetColumns.TABLENAME)
-
-        //messages
-        db.execSQL("DROP TRIGGER IF EXISTS zero_msg_upd")
-        db.execSQL("DROP TRIGGER IF EXISTS zero_msg_del")
         db.execSQL("DROP TABLE IF EXISTS " + MessageColumns.TABLENAME)
         db.execSQL("DROP TABLE IF EXISTS " + NewsColumns.TABLENAME)
         db.execSQL("DROP TABLE IF EXISTS " + PhotoAlbumsColumns.TABLENAME)
@@ -632,16 +633,36 @@ class DBHelper private constructor(context: Context, aid: Long) :
         db.execSQL(sql)
     }
 
-    /* Триггер, который удаляет историю репостов при удалении самого поста */ /*private void createDeleteWallCopyHistoryTrigger(SQLiteDatabase db) {
-        String sql = "CREATE TRIGGER [t_delete_wall_copy_history] AFTER DELETE ON [" + PostsColumns.TABLENAME + "] " +
-                " WHEN [old].[" + PostsColumns.HAS_COPY_HISTORY + "] = 1 " +
-                " BEGIN " +
-                " DELETE FROM [" + PostsColumns.TABLENAME + "] " +
-                " WHERE [" + PostsColumns.COPY_HISTORY_OF + "] = [old].[" + PostsColumns._ID + "] " +
-                " AND [" + PostsColumns.COPY_PARENT_TYPE + "] = " + PostsColumns.COPY_PARENT_TYPE_WALL + ";" +
-                " END;";
-        db.execSQL(sql);
-    }*/
+    /*
+    private fun createAttachmentsTriggers(db: SQLiteDatabase) {
+        var sql =
+            "CREATE TRIGGER [t_delete_attachments_wall] AFTER DELETE ON [" + PostsColumns.TABLENAME + "] " +
+                    " WHEN [old].[" + PostsColumns.ATTACHMENTS_COUNT + "] > 0 " +
+                    " BEGIN " +
+                    " DELETE FROM [" + WallAttachmentsColumns.TABLENAME + "] " +
+                    " WHERE [" + WallAttachmentsColumns.P_ID + "] = [old].[" + PostsColumns.POST_ID + "] ;" +
+                    " END;"
+        db.execSQL(sql)
+
+        sql =
+            "CREATE TRIGGER [t_delete_attachments_messages] AFTER DELETE ON [" + MessageColumns.TABLENAME + "] " +
+                    " WHEN [old].[" + MessageColumns.HAS_ATTACHMENTS + "] > 0 " +
+                    " BEGIN " +
+                    " DELETE FROM [" + MessagesAttachmentsColumns.TABLENAME + "] " +
+                    " WHERE [" + MessagesAttachmentsColumns.M_ID + "] = [old].[" + MessageColumns._ID + "] ;" +
+                    " END;"
+        db.execSQL(sql)
+
+        sql =
+            "CREATE TRIGGER [t_delete_attachments_comments] AFTER DELETE ON [" + CommentsColumns.TABLENAME + "] " +
+                    " WHEN [old].[" + CommentsColumns.ATTACHMENTS_COUNT + "] > 0 " +
+                    " BEGIN " +
+                    " DELETE FROM [" + CommentsAttachmentsColumns.TABLENAME + "] " +
+                    " WHERE [" + CommentsAttachmentsColumns.C_ID + "] = [old].[" + CommentsColumns.COMMENT_ID + "] ;" +
+                    " END;"
+        db.execSQL(sql)
+    }
+     */
 
     private fun createNewsTable(db: SQLiteDatabase) {
         val sql = "CREATE TABLE [" + NewsColumns.TABLENAME + "] (\n" +
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/CommunityDetailsEntity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/CommunityDetailsEntity.kt
index bc191d692..09a399054 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/CommunityDetailsEntity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/CommunityDetailsEntity.kt
@@ -40,6 +40,8 @@ class CommunityDetailsEntity {
         private set
     var narrativesCount = 0
         private set
+    var clipsCount = 0
+        private set
     var chatsCount = 0
         private set
     var status: String? = null
@@ -63,6 +65,11 @@ class CommunityDetailsEntity {
         return this
     }
 
+    fun setClipsCount(clipsCount: Int): CommunityDetailsEntity {
+        this.clipsCount = clipsCount
+        return this
+    }
+
     fun setMenu(menu: List<Menu>?): CommunityDetailsEntity {
         this.menu = menu
         return this
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/UserDetailsEntity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/UserDetailsEntity.kt
index 3b1da4098..c027a2d30 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/UserDetailsEntity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/db/model/entity/UserDetailsEntity.kt
@@ -37,6 +37,8 @@ class UserDetailsEntity {
         private set
     var narrativesCount = 0
         private set
+    var clipsCount = 0
+        private set
     var videosCount = 0
         private set
     var allWallCount = 0
@@ -135,6 +137,11 @@ class UserDetailsEntity {
         return this
     }
 
+    fun setClipsCount(clipsCount: Int): UserDetailsEntity {
+        this.clipsCount = clipsCount
+        return this
+    }
+
     fun setInterests(interests: String?): UserDetailsEntity {
         this.interests = interests
         return this
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkAdapter.kt
index 7889f16e1..df7d1057d 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkAdapter.kt
@@ -21,7 +21,6 @@ import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
 import dev.ragnarok.fenrir.settings.CurrentTheme
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.ViewUtils.displayAvatar
-import java.util.EventListener
 
 class FeedbackLinkAdapter(
     private val mContext: Context,
@@ -107,7 +106,7 @@ class FeedbackLinkAdapter(
         return mData.size
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onPostClick(post: Post)
         fun onCommentClick(comment: Comment)
         fun onTopicClick(topic: Topic)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkDialog.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkDialog.kt
index 0d2d432c0..fc38bcfef 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkDialog.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/feedbacklink/FeedbackLinkDialog.kt
@@ -26,7 +26,6 @@ import dev.ragnarok.fenrir.place.PlaceFactory.getSimpleGalleryPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getVideoPreviewPlace
 import dev.ragnarok.fenrir.util.Utils.singletonArrayList
 import java.lang.reflect.Field
-import java.util.Collections
 
 class FeedbackLinkDialog : DialogFragment(), FeedbackLinkAdapter.ActionListener {
     private var mFeedback: Feedback? = null
@@ -37,7 +36,7 @@ class FeedbackLinkDialog : DialogFragment(), FeedbackLinkAdapter.ActionListener
     }
 
     private fun getAllModels(notification: Feedback?): List<Any> {
-        notification ?: return Collections.emptyList()
+        notification ?: return emptyList()
         val models: MutableList<Any> = ArrayList()
         val fields: MutableList<Field> = ArrayList()
         fillClassFields(fields, notification.javaClass)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/privacyview/PrivacyAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/privacyview/PrivacyAdapter.kt
index e3a5b7a76..e042506fe 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/privacyview/PrivacyAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/privacyview/PrivacyAdapter.kt
@@ -19,7 +19,6 @@ import dev.ragnarok.fenrir.model.Privacy
 import dev.ragnarok.fenrir.model.User
 import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
 import dev.ragnarok.fenrir.util.Utils
-import java.util.EventListener
 
 class PrivacyAdapter(private val mContext: Context, private val mPrivacy: Privacy) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -213,7 +212,7 @@ class PrivacyAdapter(private val mContext: Context, private val mPrivacy: Privac
         mActionListener = actionListener
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onTypeClick()
         fun onAllowedUserRemove(user: User)
         fun onAllowedFriendsListRemove(friendList: FriendList)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectchairs/SelectChairsDialog.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectchairs/SelectChairsDialog.kt
index 8f4ecab77..4839f09e3 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectchairs/SelectChairsDialog.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectchairs/SelectChairsDialog.kt
@@ -14,7 +14,6 @@ import dev.ragnarok.fenrir.domain.InteractorFactory
 import dev.ragnarok.fenrir.fragment.search.filteredit.FilterEditFragment
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.model.database.Chair
-import java.util.Collections
 
 class SelectChairsDialog : AccountDependencyDialogFragment(), ChairsAdapter.Listener {
     private var chairId = 0
@@ -38,7 +37,7 @@ class SelectChairsDialog : AccountDependencyDialogFragment(), ChairsAdapter.List
             mData = ArrayList()
             firstRun = true
         }
-        mAdapter = ChairsAdapter(requireActivity(), mData ?: Collections.emptyList())
+        mAdapter = ChairsAdapter(requireActivity(), mData ?: emptyList())
         mAdapter?.setListener(this)
         mRecyclerView.adapter = mAdapter
         if (firstRun) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectcity/SelectCityDialog.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectcity/SelectCityDialog.kt
index 4a567a3a9..92e556a8d 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectcity/SelectCityDialog.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectcity/SelectCityDialog.kt
@@ -19,7 +19,6 @@ import dev.ragnarok.fenrir.fragment.search.filteredit.FilterEditFragment
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.listener.TextWatcherAdapter
 import dev.ragnarok.fenrir.model.City
-import java.util.Collections
 
 class SelectCityDialog : AccountDependencyDialogFragment(), CitiesAdapter.Listener {
     private val mHandler = Handler(Looper.getMainLooper())
@@ -54,7 +53,7 @@ class SelectCityDialog : AccountDependencyDialogFragment(), CitiesAdapter.Listen
             mData = ArrayList()
             firstRun = true
         }
-        mAdapter = CitiesAdapter(requireActivity(), mData ?: Collections.emptyList())
+        mAdapter = CitiesAdapter(requireActivity(), mData ?: emptyList())
         mAdapter?.setListener(this)
         mRecyclerView.adapter = mAdapter
         if (firstRun) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectfaculty/SelectFacultyDialog.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectfaculty/SelectFacultyDialog.kt
index 38e21f28a..c7b236ea3 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectfaculty/SelectFacultyDialog.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectfaculty/SelectFacultyDialog.kt
@@ -14,7 +14,6 @@ import dev.ragnarok.fenrir.domain.InteractorFactory
 import dev.ragnarok.fenrir.fragment.search.filteredit.FilterEditFragment
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.model.database.Faculty
-import java.util.Collections
 
 class SelectFacultyDialog : AccountDependencyDialogFragment(), FacultiesAdapter.Listener {
     private var facultyId = 0
@@ -37,7 +36,7 @@ class SelectFacultyDialog : AccountDependencyDialogFragment(), FacultiesAdapter.
             mData = ArrayList()
             firstRun = true
         }
-        mAdapter = FacultiesAdapter(requireActivity(), mData ?: Collections.emptyList())
+        mAdapter = FacultiesAdapter(requireActivity(), mData ?: emptyList())
         mAdapter?.setListener(this)
         mRecyclerView.adapter = mAdapter
         if (firstRun) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschoolclasses/SelectSchoolClassesDialog.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschoolclasses/SelectSchoolClassesDialog.kt
index b63d3b7bf..c51f8541e 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschoolclasses/SelectSchoolClassesDialog.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschoolclasses/SelectSchoolClassesDialog.kt
@@ -14,7 +14,6 @@ import dev.ragnarok.fenrir.domain.InteractorFactory
 import dev.ragnarok.fenrir.fragment.search.filteredit.FilterEditFragment
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.model.database.SchoolClazz
-import java.util.Collections
 
 class SelectSchoolClassesDialog : AccountDependencyDialogFragment(), SchoolClassesAdapter.Listener {
     private var schoolClassesId = 0
@@ -37,7 +36,7 @@ class SelectSchoolClassesDialog : AccountDependencyDialogFragment(), SchoolClass
             mData = ArrayList()
             firstRun = true
         }
-        mAdapter = SchoolClassesAdapter(requireActivity(), mData ?: Collections.emptyList())
+        mAdapter = SchoolClassesAdapter(requireActivity(), mData ?: emptyList())
         mAdapter?.setListener(this)
         mRecyclerView.adapter = mAdapter
         if (firstRun) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschools/SelectSchoolsDialog.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschools/SelectSchoolsDialog.kt
index e89152e59..d2b09bccd 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschools/SelectSchoolsDialog.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectschools/SelectSchoolsDialog.kt
@@ -19,7 +19,6 @@ import dev.ragnarok.fenrir.fragment.search.filteredit.FilterEditFragment
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.listener.TextWatcherAdapter
 import dev.ragnarok.fenrir.model.database.School
-import java.util.Collections
 
 class SelectSchoolsDialog : AccountDependencyDialogFragment(), SchoolsAdapter.Listener {
     private val mHandler = Handler(Looper.getMainLooper())
@@ -55,7 +54,7 @@ class SelectSchoolsDialog : AccountDependencyDialogFragment(), SchoolsAdapter.Li
             mData = ArrayList()
             firstRun = true
         }
-        mAdapter = SchoolsAdapter(requireActivity(), mData ?: Collections.emptyList())
+        mAdapter = SchoolsAdapter(requireActivity(), mData ?: emptyList())
         mAdapter?.setListener(this)
         mRecyclerView.adapter = mAdapter
         if (firstRun) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectuniversity/SelectUniversityDialog.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectuniversity/SelectUniversityDialog.kt
index d2f4f8d64..57e8b707b 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectuniversity/SelectUniversityDialog.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/dialog/selectuniversity/SelectUniversityDialog.kt
@@ -19,7 +19,6 @@ import dev.ragnarok.fenrir.fragment.search.filteredit.FilterEditFragment
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.listener.TextWatcherAdapter
 import dev.ragnarok.fenrir.model.database.University
-import java.util.Collections
 
 class SelectUniversityDialog : AccountDependencyDialogFragment(), UniversitiesAdapter.Listener {
     private val mHandler = Handler(Looper.getMainLooper())
@@ -54,7 +53,7 @@ class SelectUniversityDialog : AccountDependencyDialogFragment(), UniversitiesAd
             mData = ArrayList()
             firstRun = true
         }
-        mAdapter = UniversitiesAdapter(requireActivity(), mData ?: Collections.emptyList())
+        mAdapter = UniversitiesAdapter(requireActivity(), mData ?: emptyList())
         mAdapter?.setListener(this)
         mRecyclerView.adapter = mAdapter
         if (firstRun) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/ILikesInteractor.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/ILikesInteractor.kt
index 95908af37..057be5fcc 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/ILikesInteractor.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/ILikesInteractor.kt
@@ -14,14 +14,6 @@ interface ILikesInteractor {
         offset: Int
     ): Single<List<Owner>>
 
-    fun getStoriesViewers(
-        accountId: Long,
-        ownerId: Long,
-        storyId: Int,
-        count: Int,
-        offset: Int
-    ): Single<List<Owner>>
-
     companion object {
         const val FILTER_LIKES = "likes"
         const val FILTER_COPIES = "copies"
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/IOwnersRepository.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/IOwnersRepository.kt
index 1c08ea908..91c8be8bb 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/IOwnersRepository.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/IOwnersRepository.kt
@@ -12,9 +12,7 @@ import dev.ragnarok.fenrir.model.GroupChats
 import dev.ragnarok.fenrir.model.IOwnersBundle
 import dev.ragnarok.fenrir.model.Market
 import dev.ragnarok.fenrir.model.MarketAlbum
-import dev.ragnarok.fenrir.model.Narratives
 import dev.ragnarok.fenrir.model.Owner
-import dev.ragnarok.fenrir.model.Story
 import dev.ragnarok.fenrir.model.User
 import dev.ragnarok.fenrir.model.UserDetails
 import dev.ragnarok.fenrir.model.UserUpdate
@@ -78,8 +76,6 @@ interface IOwnersRepository {
         moderator: Boolean
     ): Single<List<Owner>>
 
-    fun getStoryById(accountId: Long, stories: List<AccessIdPair>): Single<List<Story>>
-
     fun searchPeoples(
         accountId: Long,
         criteria: PeopleSearchCriteria,
@@ -98,15 +94,7 @@ interface IOwnersRepository {
     fun observeUpdates(): Flowable<List<UserUpdate>>
     fun report(accountId: Long, userId: Long, type: String?, comment: String?): Single<Int>
     fun checkAndAddFriend(accountId: Long, userId: Long): Single<Int>
-    fun getStory(accountId: Long, owner_id: Long?): Single<List<Story>>
-    fun getNarratives(
-        accountId: Long,
-        owner_id: Long,
-        offset: Int?,
-        count: Int?
-    ): Single<List<Narratives>>
 
-    fun searchStory(accountId: Long, q: String?, mentioned_id: Long?): Single<List<Story>>
     fun getGroupChats(
         accountId: Long,
         groupId: Long,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/IStoriesShortVideosInteractor.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/IStoriesShortVideosInteractor.kt
new file mode 100644
index 000000000..20519c43a
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/IStoriesShortVideosInteractor.kt
@@ -0,0 +1,37 @@
+package dev.ragnarok.fenrir.domain
+
+import dev.ragnarok.fenrir.api.model.AccessIdPair
+import dev.ragnarok.fenrir.model.Narratives
+import dev.ragnarok.fenrir.model.Owner
+import dev.ragnarok.fenrir.model.Story
+import dev.ragnarok.fenrir.model.Video
+import io.reactivex.rxjava3.core.Single
+
+interface IStoriesShortVideosInteractor {
+    fun getStoriesViewers(
+        accountId: Long,
+        ownerId: Long,
+        storyId: Int,
+        count: Int,
+        offset: Int
+    ): Single<List<Pair<Owner, Boolean>>>
+
+    fun searchStory(accountId: Long, q: String?, mentioned_id: Long?): Single<List<Story>>
+    fun getStory(accountId: Long, owner_id: Long?): Single<List<Story>>
+    fun stories_delete(accountId: Long, owner_id: Long, story_id: Int): Single<Int>
+    fun getNarratives(
+        accountId: Long,
+        owner_id: Long,
+        offset: Int?,
+        count: Int?
+    ): Single<List<Narratives>>
+
+    fun getStoryById(accountId: Long, stories: List<AccessIdPair>): Single<List<Story>>
+
+    fun getShortVideos(
+        accountId: Long,
+        ownerId: Long?,
+        startFrom: String?,
+        count: Int?
+    ): Single<Pair<List<Video>, String?>>
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/InteractorFactory.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/InteractorFactory.kt
index a12bb0d24..9e1a30c2f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/InteractorFactory.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/InteractorFactory.kt
@@ -23,6 +23,7 @@ import dev.ragnarok.fenrir.domain.impl.PhotosInteractor
 import dev.ragnarok.fenrir.domain.impl.PollInteractor
 import dev.ragnarok.fenrir.domain.impl.RelationshipInteractor
 import dev.ragnarok.fenrir.domain.impl.StickersInteractor
+import dev.ragnarok.fenrir.domain.impl.StoriesShortVideosInteractor
 import dev.ragnarok.fenrir.domain.impl.UtilsInteractor
 import dev.ragnarok.fenrir.domain.impl.VideosInteractor
 import dev.ragnarok.fenrir.settings.Settings
@@ -88,7 +89,6 @@ object InteractorFactory {
         return VideosInteractor(networkInterfaces, stores)
     }
 
-
     fun createAccountInteractor(): IAccountsInteractor {
         return AccountsInteractor(
             networkInterfaces,
@@ -113,4 +113,8 @@ object InteractorFactory {
     fun createAudioInteractor(): IAudioInteractor {
         return AudioInteractor(networkInterfaces)
     }
+
+    fun createStoriesInteractor(): IStoriesShortVideosInteractor {
+        return StoriesShortVideosInteractor(networkInterfaces, owners)
+    }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/FeedInteractor.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/FeedInteractor.kt
index b47041694..be920760a 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/FeedInteractor.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/FeedInteractor.kt
@@ -28,7 +28,7 @@ import dev.ragnarok.fenrir.util.Pair.Companion.create
 import dev.ragnarok.fenrir.util.Utils.listEmptyIfNull
 import dev.ragnarok.fenrir.util.VKOwnIds
 import io.reactivex.rxjava3.core.Single
-import java.util.*
+import java.util.Locale
 
 class FeedInteractor(
     private val networker: INetworker,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/LikesInteractor.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/LikesInteractor.kt
index e17399152..359864be5 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/LikesInteractor.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/LikesInteractor.kt
@@ -41,29 +41,4 @@ class LikesInteractor(private val networker: INetworker) : ILikesInteractor {
                 owners
             }
     }
-
-    override fun getStoriesViewers(
-        accountId: Long,
-        ownerId: Long,
-        storyId: Int,
-        count: Int,
-        offset: Int
-    ): Single<List<Owner>> {
-        return networker.vkDefault(accountId)
-            .likes()
-            .getStoriesViewers(
-                ownerId,
-                storyId,
-                offset,
-                count
-            )
-            .map { response ->
-                val dtos = listEmptyIfNull(response.owners)
-                val owners: MutableList<Owner> = ArrayList(dtos.size)
-                for (dto in dtos) {
-                    transformOwner(dto)?.let { owners.add(it) }
-                }
-                owners
-            }
-    }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/MessagesRepository.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/MessagesRepository.kt
index 377b60d30..f6958e493 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/MessagesRepository.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/MessagesRepository.kt
@@ -95,7 +95,7 @@ import java.io.File
 import java.io.FileInputStream
 import java.io.FileNotFoundException
 import java.io.InputStream
-import java.util.*
+import java.util.LinkedList
 import java.util.concurrent.Executors
 
 class MessagesRepository(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/OwnersRepository.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/OwnersRepository.kt
index bf2b2e969..0c372f10f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/OwnersRepository.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/OwnersRepository.kt
@@ -4,10 +4,8 @@ import dev.ragnarok.fenrir.api.Fields
 import dev.ragnarok.fenrir.api.interfaces.INetworker
 import dev.ragnarok.fenrir.api.model.AccessIdPair
 import dev.ragnarok.fenrir.api.model.VKApiCommunity
-import dev.ragnarok.fenrir.api.model.VKApiStory
 import dev.ragnarok.fenrir.api.model.longpoll.UserIsOfflineUpdate
 import dev.ragnarok.fenrir.api.model.longpoll.UserIsOnlineUpdate
-import dev.ragnarok.fenrir.api.model.response.StoryBlockResponce
 import dev.ragnarok.fenrir.db.interfaces.IOwnersStorage
 import dev.ragnarok.fenrir.db.model.UserPatch
 import dev.ragnarok.fenrir.db.model.entity.CommunityEntity
@@ -20,21 +18,17 @@ import dev.ragnarok.fenrir.domain.mappers.Dto2Entity.mapCommunityDetails
 import dev.ragnarok.fenrir.domain.mappers.Dto2Entity.mapUser
 import dev.ragnarok.fenrir.domain.mappers.Dto2Entity.mapUserDetails
 import dev.ragnarok.fenrir.domain.mappers.Dto2Entity.mapUsers
-import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transform
 import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformCommunities
 import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformGifts
 import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformGroupChats
 import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformMarket
 import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformMarketAlbums
-import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformOwners
-import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformStory
 import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformUsers
 import dev.ragnarok.fenrir.domain.mappers.Entity2Model.buildCommunitiesFromDbos
 import dev.ragnarok.fenrir.domain.mappers.Entity2Model.buildCommunityDetailsFromDbo
 import dev.ragnarok.fenrir.domain.mappers.Entity2Model.buildUserDetailsFromDbo
 import dev.ragnarok.fenrir.domain.mappers.Entity2Model.buildUsersFromDbo
 import dev.ragnarok.fenrir.domain.mappers.Entity2Model.map
-import dev.ragnarok.fenrir.domain.mappers.MapUtil.mapAll
 import dev.ragnarok.fenrir.exception.NotFoundException
 import dev.ragnarok.fenrir.fragment.search.criteria.PeopleSearchCriteria
 import dev.ragnarok.fenrir.fragment.search.options.SpinnerOption
@@ -45,10 +39,8 @@ import dev.ragnarok.fenrir.model.GroupChats
 import dev.ragnarok.fenrir.model.IOwnersBundle
 import dev.ragnarok.fenrir.model.Market
 import dev.ragnarok.fenrir.model.MarketAlbum
-import dev.ragnarok.fenrir.model.Narratives
 import dev.ragnarok.fenrir.model.Owner
 import dev.ragnarok.fenrir.model.SparseArrayOwnersBundle
-import dev.ragnarok.fenrir.model.Story
 import dev.ragnarok.fenrir.model.User
 import dev.ragnarok.fenrir.model.UserDetails
 import dev.ragnarok.fenrir.model.UserUpdate
@@ -64,7 +56,6 @@ import dev.ragnarok.fenrir.util.Unixtime.now
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.Utils.join
 import dev.ragnarok.fenrir.util.Utils.listEmptyIfNull
-import dev.ragnarok.fenrir.util.VKOwnIds
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.core.Single
@@ -172,138 +163,6 @@ class OwnersRepository(private val networker: INetworker, private val cache: IOw
             .checkAndAddFriend(userId)
     }
 
-    private fun parseParentStory(story: List<VKApiStory>, dtos: MutableList<VKApiStory>) {
-        for (i in story) {
-            i.parent_story.requireNonNull {
-                dtos.add(it)
-            }
-        }
-    }
-
-    private fun parseStoryBlock(resp: StoryBlockResponce, dtos: MutableList<VKApiStory>) {
-        resp.stories.nonNullNoEmpty {
-            parseParentStory(it, dtos)
-            dtos.addAll(it)
-        }
-        resp.grouped.nonNullNoEmpty {
-            for (i in it) {
-                parseStoryBlock(i, dtos)
-            }
-        }
-    }
-
-    override fun getNarratives(
-        accountId: Long,
-        owner_id: Long,
-        offset: Int?,
-        count: Int?
-    ): Single<List<Narratives>> {
-        return networker.vkDefault(accountId)
-            .users()
-            .getNarratives(owner_id, offset, count)
-            .flatMap { story ->
-                val dtos = listEmptyIfNull(story.items)
-                Single.just(mapAll(dtos) { transform(it) })
-            }
-    }
-
-    override fun getStoryById(accountId: Long, stories: List<AccessIdPair>): Single<List<Story>> {
-        return networker.vkDefault(accountId)
-            .users()
-            .getStoryById(stories, 1, Fields.FIELDS_BASE_OWNER)
-            .flatMap { story ->
-                val dtos = listEmptyIfNull(story.items)
-                val owners = transformOwners(story.profiles, story.groups)
-                val ownIds = VKOwnIds()
-                for (news in dtos) {
-                    ownIds.appendStory(news)
-                }
-                findBaseOwnersDataAsBundle(
-                    accountId,
-                    ownIds.all,
-                    IOwnersRepository.MODE_ANY,
-                    owners
-                )
-                    .map<List<Story>> { owners1: IOwnersBundle ->
-                        val storiesDto: MutableList<Story> = ArrayList(dtos.size)
-                        for (dto in dtos) {
-                            storiesDto.add(transformStory(dto, owners1))
-                        }
-                        storiesDto
-                    }
-            }
-    }
-
-    override fun getStory(accountId: Long, owner_id: Long?): Single<List<Story>> {
-        return networker.vkDefault(accountId)
-            .users()
-            .getStory(owner_id, 1, Fields.FIELDS_BASE_OWNER)
-            .flatMap { story ->
-                val dtos_multy = listEmptyIfNull(story.items)
-                val dtos: MutableList<VKApiStory> = ArrayList()
-                for (itst in dtos_multy) {
-                    parseStoryBlock(itst, dtos)
-                }
-                val owners = transformOwners(story.profiles, story.groups)
-                val ownIds = VKOwnIds()
-                for (news in dtos) {
-                    ownIds.appendStory(news)
-                }
-                findBaseOwnersDataAsBundle(
-                    accountId,
-                    ownIds.all,
-                    IOwnersRepository.MODE_ANY,
-                    owners
-                )
-                    .map<List<Story>> { owners1: IOwnersBundle ->
-                        val blockAds = Settings.get().other().isAd_block_story_news
-                        val stories: MutableList<Story> = ArrayList()
-                        for (dto in dtos) {
-                            if (dto.is_ads && blockAds) {
-                                continue
-                            }
-                            stories.add(transformStory(dto, owners1))
-                        }
-                        stories
-                    }
-            }
-    }
-
-    override fun searchStory(
-        accountId: Long,
-        q: String?,
-        mentioned_id: Long?
-    ): Single<List<Story>> {
-        return networker.vkDefault(accountId)
-            .users()
-            .searchStory(q, mentioned_id, 1000, 1, Fields.FIELDS_BASE_OWNER)
-            .flatMap { story ->
-                val dtos_multy = listEmptyIfNull(story.items)
-                val dtos: MutableList<VKApiStory> = ArrayList()
-                for (itst in dtos_multy) {
-                    parseStoryBlock(itst, dtos)
-                }
-                val owners = transformOwners(story.profiles, story.groups)
-                val ownIds = VKOwnIds()
-                for (news in dtos) {
-                    ownIds.appendStory(news)
-                }
-                findBaseOwnersDataAsBundle(
-                    accountId,
-                    ownIds.all,
-                    IOwnersRepository.MODE_ANY,
-                    owners
-                )
-                    .map<List<Story>> { owners1: IOwnersBundle ->
-                        val stories: MutableList<Story> = ArrayList(dtos.size)
-                        for (dto in dtos) {
-                            stories.add(transformStory(dto, owners1))
-                        }
-                        stories
-                    }
-            }
-    }
-
     override fun getFullUserInfo(
         accountId: Long,
         userId: Long,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/StoriesShortVideosInteractor.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/StoriesShortVideosInteractor.kt
new file mode 100644
index 000000000..4d3f58ca4
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/impl/StoriesShortVideosInteractor.kt
@@ -0,0 +1,223 @@
+package dev.ragnarok.fenrir.domain.impl
+
+import dev.ragnarok.fenrir.api.Fields
+import dev.ragnarok.fenrir.api.interfaces.INetworker
+import dev.ragnarok.fenrir.api.model.AccessIdPair
+import dev.ragnarok.fenrir.api.model.VKApiStory
+import dev.ragnarok.fenrir.api.model.response.StoryBlockResponce
+import dev.ragnarok.fenrir.domain.IOwnersRepository
+import dev.ragnarok.fenrir.domain.IStoriesShortVideosInteractor
+import dev.ragnarok.fenrir.domain.mappers.Dto2Model
+import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transform
+import dev.ragnarok.fenrir.domain.mappers.Dto2Model.transformOwner
+import dev.ragnarok.fenrir.domain.mappers.MapUtil
+import dev.ragnarok.fenrir.model.IOwnersBundle
+import dev.ragnarok.fenrir.model.Narratives
+import dev.ragnarok.fenrir.model.Owner
+import dev.ragnarok.fenrir.model.Story
+import dev.ragnarok.fenrir.model.Video
+import dev.ragnarok.fenrir.nonNullNoEmpty
+import dev.ragnarok.fenrir.requireNonNull
+import dev.ragnarok.fenrir.settings.Settings
+import dev.ragnarok.fenrir.util.Utils
+import dev.ragnarok.fenrir.util.Utils.listEmptyIfNull
+import dev.ragnarok.fenrir.util.VKOwnIds
+import io.reactivex.rxjava3.core.Single
+
+class StoriesShortVideosInteractor(
+    private val networker: INetworker,
+    private val ownersRepository: IOwnersRepository
+) :
+    IStoriesShortVideosInteractor {
+    override fun getStoriesViewers(
+        accountId: Long,
+        ownerId: Long,
+        storyId: Int,
+        count: Int,
+        offset: Int
+    ): Single<List<Pair<Owner, Boolean>>> {
+        return networker.vkDefault(accountId)
+            .stories()
+            .getStoriesViewers(
+                ownerId,
+                storyId,
+                offset,
+                count
+            )
+            .map { response ->
+                val dtos = listEmptyIfNull(response.ownersWithLikes)
+                val owners: MutableList<Pair<Owner, Boolean>> = ArrayList(dtos.size)
+                for ((first, second) in dtos) {
+                    transformOwner(first)?.let { owners.add(Pair(it, second)) }
+                }
+                owners
+            }
+    }
+
+    private fun parseParentStory(story: List<VKApiStory>, dtos: MutableList<VKApiStory>) {
+        for (i in story) {
+            i.parent_story.requireNonNull {
+                dtos.add(it)
+            }
+        }
+    }
+
+    private fun parseStoryBlock(resp: StoryBlockResponce, dtos: MutableList<VKApiStory>) {
+        resp.stories.nonNullNoEmpty {
+            parseParentStory(it, dtos)
+            dtos.addAll(it)
+        }
+        resp.grouped.nonNullNoEmpty {
+            for (i in it) {
+                parseStoryBlock(i, dtos)
+            }
+        }
+    }
+
+    override fun getNarratives(
+        accountId: Long,
+        owner_id: Long,
+        offset: Int?,
+        count: Int?
+    ): Single<List<Narratives>> {
+        return networker.vkDefault(accountId)
+            .stories()
+            .getNarratives(owner_id, offset, count)
+            .flatMap { story ->
+                val dtos = listEmptyIfNull(story.items)
+                Single.just(MapUtil.mapAll(dtos) { transform(it) })
+            }
+    }
+
+    override fun getStoryById(accountId: Long, stories: List<AccessIdPair>): Single<List<Story>> {
+        return networker.vkDefault(accountId)
+            .stories()
+            .getStoryById(stories, 1, Fields.FIELDS_BASE_OWNER)
+            .flatMap { story ->
+                val dtos = listEmptyIfNull(story.items)
+                val owners = Dto2Model.transformOwners(story.profiles, story.groups)
+                val ownIds = VKOwnIds()
+                for (news in dtos) {
+                    ownIds.appendStory(news)
+                }
+                ownersRepository.findBaseOwnersDataAsBundle(
+                    accountId,
+                    ownIds.all,
+                    IOwnersRepository.MODE_ANY,
+                    owners
+                )
+                    .map<List<Story>> { owners1: IOwnersBundle ->
+                        val storiesDto: MutableList<Story> = ArrayList(dtos.size)
+                        for (dto in dtos) {
+                            storiesDto.add(Dto2Model.transformStory(dto, owners1))
+                        }
+                        storiesDto
+                    }
+            }
+    }
+
+    override fun stories_delete(accountId: Long, owner_id: Long, story_id: Int): Single<Int> {
+        return networker.vkDefault(accountId)
+            .stories().stories_delete(owner_id, story_id)
+    }
+
+    override fun getStory(accountId: Long, owner_id: Long?): Single<List<Story>> {
+        return networker.vkDefault(accountId)
+            .stories()
+            .getStory(owner_id, 1, Fields.FIELDS_BASE_OWNER)
+            .flatMap { story ->
+                val dtos_multy = listEmptyIfNull(story.items)
+                val dtos: MutableList<VKApiStory> = ArrayList()
+                for (itst in dtos_multy) {
+                    parseStoryBlock(itst, dtos)
+                }
+                val owners = Dto2Model.transformOwners(story.profiles, story.groups)
+                val ownIds = VKOwnIds()
+                for (news in dtos) {
+                    ownIds.appendStory(news)
+                }
+                ownersRepository.findBaseOwnersDataAsBundle(
+                    accountId,
+                    ownIds.all,
+                    IOwnersRepository.MODE_ANY,
+                    owners
+                )
+                    .map<List<Story>> { owners1: IOwnersBundle ->
+                        val blockAds = Settings.get().other().isAd_block_story_news
+                        val stories: MutableList<Story> = ArrayList()
+                        for (dto in dtos) {
+                            if (dto.is_ads && blockAds) {
+                                continue
+                            }
+                            stories.add(Dto2Model.transformStory(dto, owners1))
+                        }
+                        stories
+                    }
+            }
+    }
+
+    override fun searchStory(
+        accountId: Long,
+        q: String?,
+        mentioned_id: Long?
+    ): Single<List<Story>> {
+        return networker.vkDefault(accountId)
+            .stories()
+            .searchStory(q, mentioned_id, 1000, 1, Fields.FIELDS_BASE_OWNER)
+            .flatMap { story ->
+                val dtos_multy = listEmptyIfNull(story.items)
+                val dtos: MutableList<VKApiStory> = ArrayList()
+                for (itst in dtos_multy) {
+                    parseStoryBlock(itst, dtos)
+                }
+                val owners = Dto2Model.transformOwners(story.profiles, story.groups)
+                val ownIds = VKOwnIds()
+                for (news in dtos) {
+                    ownIds.appendStory(news)
+                }
+                ownersRepository.findBaseOwnersDataAsBundle(
+                    accountId,
+                    ownIds.all,
+                    IOwnersRepository.MODE_ANY,
+                    owners
+                )
+                    .map<List<Story>> { owners1: IOwnersBundle ->
+                        val stories: MutableList<Story> = ArrayList(dtos.size)
+                        for (dto in dtos) {
+                            stories.add(Dto2Model.transformStory(dto, owners1))
+                        }
+                        stories
+                    }
+            }
+    }
+
+    override fun getShortVideos(
+        accountId: Long,
+        ownerId: Long?,
+        startFrom: String?,
+        count: Int?
+    ): Single<Pair<List<Video>, String?>> {
+        return networker.vkDefault(accountId)
+            .stories()
+            .getShortVideos(ownerId, startFrom, count, 1, Fields.FIELDS_BASE_OWNER)
+            .map { response ->
+                val nextFrom = response.nextFrom
+                val videos = listEmptyIfNull(response.items)
+                val dbos: MutableList<Video> = ArrayList(videos.size)
+                for (i in videos) {
+                    dbos.add(
+                        transform(i).setOptionalOwner(
+                            transformOwner(
+                                Utils.ownerOfApiOwner(
+                                    response.profiles,
+                                    response.groups,
+                                    i.owner_id
+                                )
+                            )
+                        )
+                    )
+                }
+                Pair(dbos, nextFrom)
+            }
+    }
+}
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Dto2Entity.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Dto2Entity.kt
index 8548c12fe..f914e9273 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Dto2Entity.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Dto2Entity.kt
@@ -452,6 +452,7 @@ object Dto2Entity {
                 .setProductsCount(it.market)
                 .setProductServicesCount(it.market_services)
                 .setNarrativesCount(it.narratives)
+                .setClipsCount(it.clips)
                 .setArticlesCount(it.articles).setChatsCount(it.chats)
         }
         details.setCover(dto.cover.requireNonNull({
@@ -512,6 +513,7 @@ object Dto2Entity {
                 .setProductsCount(counters.market)
                 .setProductServicesCount(counters.market_services)
                 .setNarrativesCount(counters.narratives)
+                .setClipsCount(counters.clips)
                 .setGiftCount(counters.gifts)
                 .setAllWallCount(counters.all_wall)
                 .setOwnWallCount(counters.owner_wall).setPostponedWallCount(counters.postponed_wall)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Entity2Model.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Entity2Model.kt
index 4a7375e1f..b94befef6 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Entity2Model.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/domain/mappers/Entity2Model.kt
@@ -98,6 +98,7 @@ object Entity2Model {
             .setProductsCount(dbo.productsCount)
             .setProductServicesCount(dbo.productServicesCount)
             .setNarrativesCount(dbo.narrativesCount)
+            .setClipsCount(dbo.clipsCount)
             .setArticlesCount(dbo.articlesCount)
             .setChatsCount(dbo.chatsCount)
         dbo.menu?.nonNullNoEmpty {
@@ -192,6 +193,7 @@ object Entity2Model {
             .setProductsCount(dbo.productsCount)
             .setProductServicesCount(dbo.productServicesCount)
             .setNarrativesCount(dbo.narrativesCount)
+            .setClipsCount(dbo.clipsCount)
             .setGiftCount(dbo.giftCount)
             .setAllWallCount(dbo.allWallCount)
             .setOwnWallCount(dbo.ownWallCount)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/BrowserFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/BrowserFragment.kt
index 3478fb253..d4a1f3544 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/BrowserFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/BrowserFragment.kt
@@ -113,6 +113,10 @@ class BrowserFragment : BaseFragment(), MenuProvider, BackPressCallback,
         }
         mWebView?.settings?.userAgentString = UserAgentTool.USER_AGENT_CURRENT_ACCOUNT
         mWebView?.settings?.javaScriptEnabled = true // из-за этого не срабатывал метод
+        mWebView?.settings?.domStorageEnabled = true
+        mWebView?.settings?.blockNetworkLoads = false
+        mWebView?.settings?.blockNetworkImage = false
+        mWebView?.settings?.databaseEnabled = true
         // shouldOverrideUrlLoading в WebClient
         when {
             savedInstanceState != null -> {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallFragment.kt
index fdfbb7f7e..a5a4a7e2b 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallFragment.kt
@@ -2,12 +2,18 @@ package dev.ragnarok.fenrir.fragment.abswall
 
 import android.Manifest
 import android.annotation.SuppressLint
+import android.app.Activity
 import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
+import android.content.DialogInterface
+import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
 import android.view.*
 import android.widget.TextView
+import androidx.activity.result.ActivityResult
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.annotation.LayoutRes
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.view.MenuProvider
@@ -16,12 +22,17 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.StaggeredGridLayoutManager
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.BaseTransientBottomBar
 import dev.ragnarok.fenrir.*
 import dev.ragnarok.fenrir.activity.ActivityFeatures
+import dev.ragnarok.fenrir.activity.DualTabPhotoActivity
+import dev.ragnarok.fenrir.api.impl.AbsApi
+import dev.ragnarok.fenrir.api.model.AccessIdPair
 import dev.ragnarok.fenrir.fragment.abswall.WallAdapter.NonPublishedPostActionListener
 import dev.ragnarok.fenrir.fragment.base.PlaceSupportMvpFragment
 import dev.ragnarok.fenrir.fragment.base.horizontal.HorizontalStoryAdapter
+import dev.ragnarok.fenrir.fragment.docs.DocsUploadAdapter
 import dev.ragnarok.fenrir.fragment.groupwall.GroupWallFragment
 import dev.ragnarok.fenrir.fragment.search.SearchContentType
 import dev.ragnarok.fenrir.fragment.search.criteria.WallSearchCriteria
@@ -37,6 +48,11 @@ import dev.ragnarok.fenrir.modalbottomsheetdialogfragment.ModalBottomSheetDialog
 import dev.ragnarok.fenrir.modalbottomsheetdialogfragment.Option
 import dev.ragnarok.fenrir.modalbottomsheetdialogfragment.OptionRequest
 import dev.ragnarok.fenrir.model.*
+import dev.ragnarok.fenrir.model.selection.FileManagerSelectableSource
+import dev.ragnarok.fenrir.model.selection.LocalGallerySelectableSource
+import dev.ragnarok.fenrir.model.selection.LocalPhotosSelectableSource
+import dev.ragnarok.fenrir.model.selection.LocalVideosSelectableSource
+import dev.ragnarok.fenrir.model.selection.Sources
 import dev.ragnarok.fenrir.module.FenrirNative
 import dev.ragnarok.fenrir.module.thorvg.ThorVGRender
 import dev.ragnarok.fenrir.place.PlaceFactory
@@ -44,6 +60,7 @@ import dev.ragnarok.fenrir.place.PlaceFactory.getAudiosPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getNarrativesPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getOwnerArticles
 import dev.ragnarok.fenrir.place.PlaceFactory.getPhotoAlbumGalleryPlace
+import dev.ragnarok.fenrir.place.PlaceFactory.getShortVideoPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getSingleTabSearchPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getVKPhotoAlbumsPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getVideosPlace
@@ -51,6 +68,7 @@ import dev.ragnarok.fenrir.place.PlaceFactory.getWallAttachmentsPlace
 import dev.ragnarok.fenrir.place.PlaceUtil.goToPostCreation
 import dev.ragnarok.fenrir.place.PlaceUtil.goToPostEditor
 import dev.ragnarok.fenrir.settings.Settings
+import dev.ragnarok.fenrir.upload.Upload
 import dev.ragnarok.fenrir.util.*
 import dev.ragnarok.fenrir.util.AppPerms.requestPermissionsAbs
 import dev.ragnarok.fenrir.util.AppTextUtils.getCounterWithK
@@ -64,15 +82,21 @@ import dev.ragnarok.fenrir.view.LoadMoreFooterHelper
 import dev.ragnarok.fenrir.view.LoadMoreFooterHelper.Companion.createFrom
 import dev.ragnarok.fenrir.view.UpEditFab
 import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+import me.minetsh.imaging.IMGEditActivity
+import java.io.File
 
 abstract class AbsWallFragment<V : IWallView, P : AbsWallPresenter<V>> :
     PlaceSupportMvpFragment<P, V>(), IWallView, WallAdapter.ClickListener,
-    NonPublishedPostActionListener, MenuProvider, BackPressCallback {
+    NonPublishedPostActionListener, MenuProvider, BackPressCallback,
+    DocsUploadAdapter.ActionListener {
     private var mSwipeRefreshLayout: SwipeRefreshLayout? = null
     private var mWallAdapter: WallAdapter? = null
     private var mLoadMoreFooterHelper: LoadMoreFooterHelper? = null
     private var mStoryAdapter: HorizontalStoryAdapter? = null
     private var fabCreate: UpEditFab? = null
+
+    private var mUploadAdapter: DocsUploadAdapter? = null
+    private var mUploadRoot: View? = null
     protected fun setupPaganContent(Runes: View?, paganSymbol: RLottieImageView?) {
         Runes?.visibility = if (Settings.get()
                 .other().isRunes_show
@@ -133,6 +157,75 @@ abstract class AbsWallFragment<V : IWallView, P : AbsWallPresenter<V>> :
         return true
     }
 
+    private val openRequestStory =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+            if (result.data != null && result.resultCode == Activity.RESULT_OK) {
+                val localPhotos: ArrayList<LocalPhoto>? =
+                    result.data?.getParcelableArrayListExtraCompat(Extra.PHOTOS)
+                val file = result.data?.getStringExtra(Extra.PATH)
+                val video: LocalVideo? = result.data?.getParcelableExtraCompat(Extra.VIDEO)
+                lazyPresenter {
+                    fireStorySelected(requireActivity(), localPhotos, file, video)
+                }
+            }
+        }
+
+    private val openRequestResizeStoryPhoto =
+        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
+            if (result.resultCode == Activity.RESULT_OK) {
+                lazyPresenter {
+                    doUploadStoryFile(
+                        (result.data
+                            ?: return@lazyPresenter).getStringExtra(IMGEditActivity.EXTRA_IMAGE_SAVE_PATH)
+                            ?: return@lazyPresenter,
+                        Upload.IMAGE_SIZE_FULL,
+                        false
+                    )
+                }
+            }
+        }
+
+    override fun doEditStoryPhoto(uri: Uri) {
+        try {
+            openRequestResizeStoryPhoto.launch(
+                Intent(requireContext(), IMGEditActivity::class.java)
+                    .putExtra(IMGEditActivity.EXTRA_IMAGE_URI, uri)
+                    .putExtra(
+                        IMGEditActivity.EXTRA_IMAGE_SAVE_PATH,
+                        File(requireActivity().externalCacheDir.toString() + File.separator + "scale.jpg").absolutePath
+                    )
+            )
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+    }
+
+    override fun showAvatarUploadedMessage(accountId: Long, post: Post) {
+        MaterialAlertDialogBuilder(requireActivity())
+            .setTitle(R.string.success)
+            .setMessage(R.string.avatar_was_changed_successfully)
+            .setPositiveButton(R.string.button_show) { _: DialogInterface?, _: Int ->
+                PlaceFactory.getPostPreviewPlace(
+                    accountId,
+                    post.vkid,
+                    post.ownerId,
+                    post
+                ).tryOpenWith(requireActivity())
+            }
+            .setNegativeButton(R.string.button_ok, null)
+            .show()
+    }
+
+    fun requestUploadStory() {
+        val sources = Sources()
+            .with(LocalPhotosSelectableSource())
+            .with(LocalGallerySelectableSource())
+            .with(LocalVideosSelectableSource())
+            .with(FileManagerSelectableSource())
+        val intent = DualTabPhotoActivity.createIntent(requireActivity(), 1, sources)
+        openRequestStory.launch(intent)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         requireActivity().addMenuProvider(this, viewLifecycleOwner)
@@ -142,6 +235,10 @@ abstract class AbsWallFragment<V : IWallView, P : AbsWallPresenter<V>> :
         getNarrativesPlace(accountId, ownerId).tryOpenWith(requireActivity())
     }
 
+    override fun goClips(accountId: Long, ownerId: Long) {
+        getShortVideoPlace(accountId, ownerId).tryOpenWith(requireActivity())
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -149,6 +246,14 @@ abstract class AbsWallFragment<V : IWallView, P : AbsWallPresenter<V>> :
     ): View? {
         val root = inflater.inflate(R.layout.fragment_wall, container, false)
         (requireActivity() as AppCompatActivity).setSupportActionBar(root.findViewById(R.id.toolbar))
+
+        val uploadRecyclerView: RecyclerView = root.findViewById(R.id.uploads_recycler_view)
+        uploadRecyclerView.layoutManager =
+            LinearLayoutManager(requireActivity(), LinearLayoutManager.HORIZONTAL, false)
+        mUploadAdapter = DocsUploadAdapter(emptyList(), this)
+        uploadRecyclerView.adapter = mUploadAdapter
+        mUploadRoot = root.findViewById(R.id.uploads_root)
+
         mSwipeRefreshLayout = root.findViewById(R.id.refresh)
         mSwipeRefreshLayout?.setOnRefreshListener {
             presenter?.fireRefresh()
@@ -200,13 +305,46 @@ abstract class AbsWallFragment<V : IWallView, P : AbsWallPresenter<V>> :
             }
 
             override fun onStoryLongClick(item: Story, pos: Int): Boolean {
-                PlaceFactory.getLikesCopiesPlace(
-                    Settings.get().accounts().current,
-                    "stories_view",
-                    item.ownerId,
-                    item.id,
-                    null
-                ).tryOpenWith(requireActivity())
+                val isMy = item.ownerId == Settings.get().accounts().current
+                val items: Array<String> = if (isMy) {
+                    arrayOf(
+                        getString(R.string.delete),
+                        getString(R.string.views)
+                    )
+                } else {
+                    arrayOf(getString(R.string.answer), getString(R.string.views))
+                }
+                MaterialAlertDialogBuilder(requireActivity()).setItems(items) { _: DialogInterface?, i: Int ->
+                    when (i) {
+                        0 -> {
+                            if (!isMy) {
+                                presenter?.updateToStory(AbsApi.join(
+                                    listOf(AccessIdPair(item.id, item.ownerId, item.accessKey)),
+                                    ","
+                                ) { AccessIdPair.format(it) })
+                                requestUploadStory()
+                            } else {
+                                MaterialAlertDialogBuilder(
+                                    requireActivity()
+                                ).setMessage(R.string.do_delete)
+                                    .setTitle(R.string.confirmation)
+                                    .setCancelable(true)
+                                    .setPositiveButton(R.string.button_yes) { _: DialogInterface?, _: Int ->
+                                        presenter?.fireRemoveStoryClick(item.ownerId, item.id)
+                                    }.setNegativeButton(R.string.button_cancel, null)
+                                    .show()
+                            }
+                        }
+
+                        1 -> {
+                            PlaceFactory.getStoriesViewPlace(
+                                Settings.get().accounts().current,
+                                item.ownerId,
+                                item.id
+                            ).tryOpenWith(requireActivity())
+                        }
+                    }
+                }.setCancelable(true).show()
                 return true
             }
         })
@@ -573,6 +711,36 @@ abstract class AbsWallFragment<V : IWallView, P : AbsWallPresenter<V>> :
         presenter?.fireButtonRemoveClick(post)
     }
 
+    override fun onRemoveClick(upload: Upload) {
+        presenter?.fireRemoveClick(
+            upload
+        )
+    }
+
+    override fun setUploadDataVisible(visible: Boolean) {
+        mUploadRoot?.visibility = if (visible) View.VISIBLE else View.GONE
+    }
+
+    override fun displayUploads(data: List<Upload>) {
+        mUploadAdapter?.setData(data)
+    }
+
+    override fun notifyUploadItemsAdded(position: Int, count: Int) {
+        mUploadAdapter?.notifyItemRangeInserted(position, count)
+    }
+
+    override fun notifyUploadItemChanged(position: Int) {
+        mUploadAdapter?.notifyItemChanged(position)
+    }
+
+    override fun notifyUploadItemRemoved(position: Int) {
+        mUploadAdapter?.notifyItemRemoved(position)
+    }
+
+    override fun notifyUploadProgressChanged(position: Int, progress: Int, smoothly: Boolean) {
+        mUploadAdapter?.changeUploadProgress(position, progress, smoothly)
+    }
+
     protected class OptionView : IWallView.IOptionView {
         var isMy = false
         var isBlacklistedByMe = false
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallPresenter.kt
index 89b031a94..bdb05ffc3 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/AbsWallPresenter.kt
@@ -13,12 +13,14 @@ import android.widget.Spinner
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.imageview.ShapeableImageView
 import com.google.android.material.textfield.TextInputEditText
+import dev.ragnarok.fenrir.Includes
 import dev.ragnarok.fenrir.Includes.provideMainThreadScheduler
 import dev.ragnarok.fenrir.R
 import dev.ragnarok.fenrir.api.model.VKApiPost
 import dev.ragnarok.fenrir.api.model.VKApiProfileInfo
 import dev.ragnarok.fenrir.db.model.PostUpdate
 import dev.ragnarok.fenrir.domain.IOwnersRepository
+import dev.ragnarok.fenrir.domain.IStoriesShortVideosInteractor
 import dev.ragnarok.fenrir.domain.IWallsRepository
 import dev.ragnarok.fenrir.domain.InteractorFactory
 import dev.ragnarok.fenrir.domain.Repository
@@ -30,6 +32,16 @@ import dev.ragnarok.fenrir.model.criteria.WallCriteria
 import dev.ragnarok.fenrir.nonNullNoEmpty
 import dev.ragnarok.fenrir.requireNonNull
 import dev.ragnarok.fenrir.settings.Settings
+import dev.ragnarok.fenrir.upload.IUploadManager
+import dev.ragnarok.fenrir.upload.MessageMethod
+import dev.ragnarok.fenrir.upload.Method
+import dev.ragnarok.fenrir.upload.Upload
+import dev.ragnarok.fenrir.upload.UploadDestination
+import dev.ragnarok.fenrir.upload.UploadIntent
+import dev.ragnarok.fenrir.upload.UploadResult
+import dev.ragnarok.fenrir.upload.UploadUtils
+import dev.ragnarok.fenrir.util.Pair
+import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.Utils.checkEditInfo
 import dev.ragnarok.fenrir.util.Utils.findIndexByPredicate
 import dev.ragnarok.fenrir.util.Utils.findInfoByPredicate
@@ -59,6 +71,7 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
 
     val stories: MutableList<Story>
     private val ownersRepository: IOwnersRepository
+    private val storiesInteractor: IStoriesShortVideosInteractor
     private val walls: IWallsRepository
     private val cacheCompositeDisposable = CompositeDisposable()
     private val netCompositeDisposable = CompositeDisposable()
@@ -69,12 +82,45 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
     private var nowRequestOffset = 0
     private var nextOffset = 0
     private var actualDataReady = false
-
+    private val uploadManager: IUploadManager = Includes.uploadManager
     private var skipWallOffset = 0
+    private var toStory: String? = null
+    private val uploadsData: MutableList<Upload> = ArrayList(0)
     open fun searchStory(ByName: Boolean) {
         throw IllegalArgumentException("Unknown story search")
     }
 
+    private fun firePrepared() {
+        appendDisposable(uploadManager[accountId, listOf(Method.STORY, Method.PHOTO_TO_PROFILE)]
+            .fromIOToMain()
+            .subscribe { data -> onUploadsDataReceived(data) })
+        appendDisposable(uploadManager.observeAdding()
+            .observeOn(provideMainThreadScheduler())
+            .subscribe { added -> onUploadsAdded(added) })
+        appendDisposable(uploadManager.observeDeleting(true)
+            .observeOn(provideMainThreadScheduler())
+            .subscribe { ids -> onUploadDeleted(ids) })
+        appendDisposable(uploadManager.observeResults()
+            .filter {
+                listOf(
+                    Method.STORY,
+                    Method.PHOTO_TO_PROFILE
+                ).contains(it.first.destination.method)
+            }
+            .observeOn(provideMainThreadScheduler())
+            .subscribe { pair -> onUploadFinished(pair) })
+        appendDisposable(uploadManager.observeStatus()
+            .observeOn(provideMainThreadScheduler())
+            .subscribe { upload -> onUploadStatusUpdate(upload) })
+        appendDisposable(uploadManager.observeProgress()
+            .observeOn(provideMainThreadScheduler())
+            .subscribe { updates -> onProgressUpdates(updates) })
+    }
+
+    fun updateToStory(toStory: String?) {
+        this.toStory = toStory
+    }
+
     fun fireRequestSkipOffset() {
         view?.onRequestSkipOffset(accountId, ownerId, wallFilter, nextOffset + skipWallOffset)
     }
@@ -83,6 +129,10 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
         view?.goNarratives(accountId, ownerId)
     }
 
+    fun fireClipsClick() {
+        view?.goClips(accountId, ownerId)
+    }
+
     private fun onPostInvalid(postVkid: Int) {
         val index = findIndexByPredicate(
             wall
@@ -133,6 +183,9 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
         viewHost.displayWallData(wall)
         viewHost.updateStory(stories)
         resolveLoadMoreFooterView()
+
+        viewHost.displayUploads(uploadsData)
+        resolveUploadDataVisibility()
     }
 
     internal fun onExecuteComplete() {
@@ -160,10 +213,22 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
             .subscribe({ onExecuteComplete() }) { t -> onExecuteError(t) })
     }
 
+    fun fireRemoveStoryClick(storyOwnerId: Long, id: Int) {
+        appendDisposable(
+            storiesInteractor
+                .stories_delete(accountId, storyOwnerId, id)
+                .fromIOToMain()
+                .subscribe({ fireRefresh() }) { t -> onExecuteError(t) })
+    }
+
     private fun loadWallCachedData() {
         cacheCompositeDisposable.add(walls.getCachedWall(accountId, ownerId, wallFilter)
             .fromIOToMain()
-            .subscribe({ posts -> onCachedDataReceived(posts) }) { obj -> obj.printStackTrace() })
+            .subscribe({ posts -> onCachedDataReceived(posts) }) { obj ->
+                obj.printStackTrace()
+                actualDataReady = false
+                requestWall(0)
+            })
     }
 
     private fun onCachedDataReceived(posts: List<Post>) {
@@ -171,6 +236,7 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
         wall.addAll(posts)
         actualDataReady = false
         view?.notifyWallDataSetChanged()
+        requestWall(0)
     }
 
     public override fun onGuiResumed() {
@@ -406,7 +472,7 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
         cacheCompositeDisposable.clear()
         requestWall(0)
         if (!Settings.get().other().isDisable_history) {
-            appendDisposable(ownersRepository.getStory(
+            appendDisposable(storiesInteractor.getStory(
                 accountId,
                 if (accountId == ownerId) null else ownerId
             )
@@ -629,16 +695,216 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
         }
     }
 
+    private fun doUploadStoryFile(context: Context, file: String) {
+        for (i in Settings.get().other().photoExt()) {
+            if (file.endsWith(i, true)) {
+                Uri.fromFile(
+                    File(
+                        file
+                    )
+                )
+                return
+            }
+        }
+        for (i in Settings.get().other().videoExt()) {
+            if (file.endsWith(i, true)) {
+                doUploadStoryFile(
+                    file,
+                    0,
+                    true
+                )
+                return
+            }
+        }
+        MaterialAlertDialogBuilder(context)
+            .setTitle(R.string.select)
+            .setNegativeButton(R.string.video) { _: DialogInterface?, _: Int ->
+                doUploadStoryFile(
+                    file,
+                    0,
+                    true
+                )
+            }
+            .setPositiveButton(R.string.photo) { _: DialogInterface?, _: Int ->
+                view?.doEditStoryPhoto(
+                    Uri.fromFile(
+                        File(
+                            file
+                        )
+                    )
+                )
+            }
+            .create().show()
+    }
+
+    fun doUploadStoryFile(file: String, size: Int, isVideo: Boolean) {
+        val intents: List<UploadIntent> = if (isVideo) {
+            UploadUtils.createIntents(
+                accountId,
+                UploadDestination.forStory(MessageMethod.VIDEO, toStory),
+                file,
+                size,
+                true
+            )
+        } else {
+            UploadUtils.createIntents(
+                accountId,
+                UploadDestination.forStory(MessageMethod.PHOTO, toStory),
+                file,
+                size,
+                true
+            )
+        }
+        toStory = null
+        uploadManager.enqueue(intents)
+    }
+
+    fun fireRemoveClick(upload: Upload) {
+        uploadManager.cancel(upload.getObjectId())
+    }
+
+    private fun doUploadStoryVideo(file: String) {
+        val intents = UploadUtils.createVideoIntents(
+            accountId,
+            UploadDestination.forStory(MessageMethod.VIDEO, toStory),
+            file,
+            true
+        )
+        toStory = null
+        uploadManager.enqueue(intents)
+    }
+
+    private fun doUploadStoryPhotos(photos: List<LocalPhoto>) {
+        if (photos.size == 1) {
+            var to_up = photos[0].getFullImageUri() ?: return
+            if (to_up.path?.let { File(it).isFile } == true) {
+                to_up = Uri.fromFile(to_up.path?.let { File(it) })
+            }
+            view?.doEditStoryPhoto(to_up)
+            return
+        }
+        val intents = UploadUtils.createIntents(
+            accountId,
+            UploadDestination.forStory(MessageMethod.PHOTO, toStory),
+            photos,
+            Upload.IMAGE_SIZE_FULL,
+            true
+        )
+        toStory = null
+        uploadManager.enqueue(intents)
+    }
+
+    fun fireStorySelected(
+        context: Context,
+        localPhotos: ArrayList<LocalPhoto>?,
+        file: String?,
+        video: LocalVideo?
+    ) {
+        when {
+            file.nonNullNoEmpty() -> doUploadStoryFile(context, file)
+            localPhotos.nonNullNoEmpty() -> {
+                doUploadStoryPhotos(localPhotos)
+            }
+
+            video != null -> {
+                doUploadStoryVideo(video.getData().toString())
+            }
+        }
+    }
+
+    fun fireNewAvatarPhotoSelected(file: String?) {
+        val intent = UploadIntent(accountId, UploadDestination.forProfilePhoto(ownerId))
+            .setAutoCommit(true)
+            .setFileUri(Uri.parse(file))
+            .setSize(Upload.IMAGE_SIZE_FULL)
+        uploadManager.enqueue(listOf(intent))
+    }
+
+    private fun onUploadFinished(pair: Pair<Upload, UploadResult<*>>) {
+        val destination = pair.first.destination
+        if (destination.method == Method.PHOTO_TO_PROFILE && destination.ownerId == ownerId) {
+            onRefresh()
+            val post = pair.second.result as Post
+            resumedView?.showAvatarUploadedMessage(
+                accountId,
+                post
+            )
+        } else if (destination.method == Method.STORY && Settings.get()
+                .accounts().current == ownerId
+        ) {
+            fireRefresh()
+        }
+    }
+
+    private fun resolveUploadDataVisibility() {
+        view?.setUploadDataVisible(uploadsData.isNotEmpty())
+    }
+
+    private fun onUploadsDataReceived(data: List<Upload>) {
+        uploadsData.clear()
+        uploadsData.addAll(data)
+        resolveUploadDataVisibility()
+    }
+
+    private fun onProgressUpdates(updates: List<IUploadManager.IProgressUpdate>) {
+        for (update in updates) {
+            val index = Utils.findIndexById(uploadsData, update.id)
+            if (index != -1) {
+                view?.notifyUploadProgressChanged(
+                    index,
+                    update.progress,
+                    true
+                )
+            }
+        }
+    }
+
+    private fun onUploadStatusUpdate(upload: Upload) {
+        val index = Utils.findIndexById(uploadsData, upload.getObjectId())
+        if (index != -1) {
+            view?.notifyUploadItemChanged(
+                index
+            )
+        }
+    }
+
+    private fun onUploadsAdded(added: List<Upload>) {
+        for (u in added) {
+            if (listOf(Method.STORY, Method.PHOTO_TO_PROFILE).contains(u.destination.method)) {
+                val index = uploadsData.size
+                uploadsData.add(u)
+                view?.notifyUploadItemsAdded(
+                    index,
+                    1
+                )
+            }
+        }
+        resolveUploadDataVisibility()
+    }
+
+    private fun onUploadDeleted(ids: IntArray) {
+        for (id in ids) {
+            val index = Utils.findIndexById(uploadsData, id)
+            if (index != -1) {
+                uploadsData.removeAt(index)
+                view?.notifyUploadItemRemoved(
+                    index
+                )
+            }
+        }
+        resolveUploadDataVisibility()
+    }
+
     init {
         wall = ArrayList()
         stories = ArrayList()
         wallFilter = WallCriteria.MODE_ALL
         walls = Repository.walls
         ownersRepository = owners
+        storiesInteractor = InteractorFactory.createStoriesInteractor()
         loadWallCachedData()
-        requestWall(0)
         if (!Settings.get().other().isDisable_history) {
-            appendDisposable(ownersRepository.getStory(
+            appendDisposable(storiesInteractor.getStory(
                 accountId,
                 if (accountId == ownerId) null else ownerId
             )
@@ -666,5 +932,6 @@ abstract class AbsWallPresenter<V : IWallView> internal constructor(
             .filter { it.ownerId == ownerId }
             .observeOn(provideMainThreadScheduler())
             .subscribe { onPostInvalid(it.id) })
+        firePrepared()
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/IWallView.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/IWallView.kt
index 851d19c00..a0855dda3 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/IWallView.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/abswall/IWallView.kt
@@ -1,5 +1,6 @@
 package dev.ragnarok.fenrir.fragment.abswall
 
+import android.net.Uri
 import dev.ragnarok.fenrir.fragment.base.IAttachmentsPlacesView
 import dev.ragnarok.fenrir.fragment.base.core.IErrorView
 import dev.ragnarok.fenrir.fragment.base.core.IMvpView
@@ -11,6 +12,7 @@ import dev.ragnarok.fenrir.model.Owner
 import dev.ragnarok.fenrir.model.Photo
 import dev.ragnarok.fenrir.model.Post
 import dev.ragnarok.fenrir.model.Story
+import dev.ragnarok.fenrir.upload.Upload
 
 interface IWallView : IAttachmentsPlacesView, IMvpView, ISnackbarView,
     IErrorView, IToastView {
@@ -37,9 +39,11 @@ interface IWallView : IAttachmentsPlacesView, IMvpView, ISnackbarView,
 
     fun goToWallSearch(accountId: Long, ownerId: Long)
     fun openPostEditor(accountId: Long, post: Post)
+    fun showAvatarUploadedMessage(accountId: Long, post: Post)
     fun notifyWallItemRemoved(index: Int)
     fun goToConversationAttachments(accountId: Long, ownerId: Long)
     fun goNarratives(accountId: Long, ownerId: Long)
+    fun goClips(accountId: Long, ownerId: Long)
     interface IOptionView {
         fun typeOwnerId(id: Long)
         fun setIsMy(my: Boolean)
@@ -48,5 +52,14 @@ interface IWallView : IAttachmentsPlacesView, IMvpView, ISnackbarView,
         fun setIsSubscribed(subscribed: Boolean)
     }
 
+    fun doEditStoryPhoto(uri: Uri)
+
     fun onRequestSkipOffset(accountId: Long, ownerId: Long, wallFilter: Int, currentPos: Int)
+
+    fun notifyUploadItemsAdded(position: Int, count: Int)
+    fun notifyUploadItemRemoved(position: Int)
+    fun notifyUploadItemChanged(position: Int)
+    fun notifyUploadProgressChanged(position: Int, progress: Int, smoothly: Boolean)
+    fun setUploadDataVisible(visible: Boolean)
+    fun displayUploads(data: List<Upload>)
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt
index cfc73ef87..7e4d70b98 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/accounts/AccountsFragment.kt
@@ -50,7 +50,6 @@ import dev.ragnarok.fenrir.util.serializeble.json.*
 import dev.ragnarok.fenrir.util.toast.CustomSnackbars
 import dev.ragnarok.fenrir.util.toast.CustomToast.Companion.createCustomToast
 import okhttp3.*
-import java.util.*
 
 class AccountsFragment : BaseMvpFragment<AccountsPresenter, IAccountsView>(), IAccountsView,
     View.OnClickListener, AccountAdapter.Callback,
@@ -250,7 +249,7 @@ class AccountsFragment : BaseMvpFragment<AccountsPresenter, IAccountsView>(), IA
             }
         }).attachToRecyclerView(mRecyclerView)
         root.findViewById<View>(R.id.fab).setOnClickListener(this)
-        mAdapter = AccountAdapter(requireActivity(), Collections.emptyList(), this)
+        mAdapter = AccountAdapter(requireActivity(), emptyList(), this)
         mRecyclerView?.adapter = mAdapter
         return root
     }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/absattachmentsedit/AbsAttachmentsEditFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/absattachmentsedit/AbsAttachmentsEditFragment.kt
index 07fe91ba7..545e6719d 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/absattachmentsedit/AbsAttachmentsEditFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/absattachmentsedit/AbsAttachmentsEditFragment.kt
@@ -46,7 +46,7 @@ import dev.ragnarok.fenrir.view.WeakRunnable
 import dev.ragnarok.fenrir.view.YoutubeButton
 import me.minetsh.imaging.IMGEditActivity
 import java.io.File
-import java.util.*
+import java.util.Locale
 
 abstract class AbsAttachmentsEditFragment<P : AbsAttachmentsEditPresenter<V>, V : IBaseAttachmentsEditView> :
     BaseMvpFragment<P, V>(), IBaseAttachmentsEditView, AttchmentsEditorAdapter.Callback,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentcreate/CommentCreatePresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentcreate/CommentCreatePresenter.kt
index 552cf217a..a00faeca0 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentcreate/CommentCreatePresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentcreate/CommentCreatePresenter.kt
@@ -169,7 +169,7 @@ class CommentCreatePresenter(
         appendDisposable(uploadManager.observeAdding()
             .observeOn(provideMainThreadScheduler())
             .subscribe { it -> onUploadQueueUpdates(it) { destination.compareTo(it.destination) } })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe {
                 onUploadStatusUpdate(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentedit/CommentEditPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentedit/CommentEditPresenter.kt
index 355bb0205..f84f9070b 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentedit/CommentEditPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/commentedit/CommentEditPresenter.kt
@@ -207,7 +207,7 @@ class CommentEditPresenter(
                     it
                 )
             })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe {
                 onUploadStatusUpdate(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postcreate/PostCreatePresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postcreate/PostCreatePresenter.kt
index 51e2e95a3..c3bd33b3d 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postcreate/PostCreatePresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postcreate/PostCreatePresenter.kt
@@ -210,7 +210,7 @@ class PostCreatePresenter(
         appendDisposable(uploadManager.observeProgress()
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadProgressUpdate(it) })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe {
                 onUploadStatusUpdate(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postedit/PostEditPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postedit/PostEditPresenter.kt
index 6d95031f7..ae39f58a7 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postedit/PostEditPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/attachments/postedit/PostEditPresenter.kt
@@ -437,7 +437,7 @@ class PostEditPresenter(
         appendDisposable(uploadManager.observeProgress()
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadProgressUpdate(it) })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe {
                 onUploadStatusUpdate(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/audioslocal/AudiosLocalPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/audioslocal/AudiosLocalPresenter.kt
index 1360c53f6..c489b0d56 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/audioslocal/AudiosLocalPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/audio/local/audioslocal/AudiosLocalPresenter.kt
@@ -67,7 +67,7 @@ class AudiosLocalPresenter(accountId: Long, savedInstanceState: Bundle?) :
             }
             .observeOn(provideMainThreadScheduler())
             .subscribe { pair -> onUploadResults(pair) })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe { upload -> onUploadStatusUpdate(upload) })
         appendDisposable(uploadManager.observeProgress()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt
index 24ff2e2a6..005bca2cb 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/base/AttachmentsViewBinder.kt
@@ -42,7 +42,6 @@ import dev.ragnarok.fenrir.view.WaveFormView
 import dev.ragnarok.fenrir.view.emoji.EmojiconTextView
 import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
 import java.lang.ref.WeakReference
-import java.util.*
 import kotlin.math.abs
 
 class AttachmentsViewBinder(
@@ -1007,7 +1006,7 @@ class AttachmentsViewBinder(
         }
     }
 
-    interface VoiceActionListener : EventListener {
+    interface VoiceActionListener {
         fun onVoiceHolderBinded(voiceMessageId: Int, voiceHolderId: Int)
         fun onVoicePlayButtonClick(
             voiceHolderId: Int,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsPresenter.kt
index 779edb234..89fe154af 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/comments/CommentsPresenter.kt
@@ -1058,7 +1058,9 @@ class CommentsPresenter(
         cacheLoadingDisposable.add(
             interactor.getAllCachedData(accountId, commented)
                 .fromIOToMain()
-                .subscribe({ onCachedDataReceived(it) }, ignore())
+                .subscribe({ onCachedDataReceived(it) }, {
+                    requestInitialData()
+                })
         )
     }
 
@@ -1099,6 +1101,7 @@ class CommentsPresenter(
         if (!directionDesc) {
             view?.scrollToPosition(data.size - 1)
         }
+        requestInitialData()
     }
 
     @SuppressLint("CheckResult")
@@ -1167,10 +1170,6 @@ class CommentsPresenter(
         directionDesc = Settings.get().other().isCommentsDesc
         this.CommentThread = CommentThread
         data = ArrayList()
-        if (focusToComment == null && CommentThread == null) {
-            // если надо сфокусироваться на каком-то комментарии - не грузим из кэша
-            loadCachedData()
-        }
         val attachmentsRepository = attachmentsRepository
         appendDisposable(attachmentsRepository
             .observeAdding()
@@ -1189,7 +1188,12 @@ class CommentsPresenter(
             .observeOn(provideMainThreadScheduler())
             .subscribe({ update -> onCommentMinorUpdate(update) }) { it.printStackTrace() })
         restoreDraftCommentSync()
-        requestInitialData()
         loadAuthorData()
+        if (focusToComment == null && CommentThread == null) {
+            // если надо сфокусироваться на каком-то комментарии - не грузим из кэша
+            loadCachedData()
+        } else {
+            requestInitialData()
+        }
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAdapter.kt
index 54feb7f9e..ef9ee0b57 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAdapter.kt
@@ -13,7 +13,6 @@ import dev.ragnarok.fenrir.model.PhotoSize
 import dev.ragnarok.fenrir.nonNullNoEmpty
 import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
 import dev.ragnarok.fenrir.util.AppTextUtils
-import java.util.EventListener
 import java.util.Locale
 
 class DocsAdapter(data: MutableList<Document>) :
@@ -61,7 +60,7 @@ class DocsAdapter(data: MutableList<Document>) :
         return R.layout.item_document_big
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onDocClick(index: Int, doc: Document)
         fun onDocLongClick(index: Int, doc: Document): Boolean
     }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAsImagesAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAsImagesAdapter.kt
index a05903f11..4c69a3efd 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAsImagesAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsAsImagesAdapter.kt
@@ -11,7 +11,6 @@ import dev.ragnarok.fenrir.model.Document
 import dev.ragnarok.fenrir.model.PhotoSize
 import dev.ragnarok.fenrir.nonNullNoEmpty
 import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
-import java.util.EventListener
 
 class DocsAsImagesAdapter(data: MutableList<Document>) :
     RecyclerBindableAdapter<Document, DocsAsImagesAdapter.DocViewHolder>(data) {
@@ -54,7 +53,7 @@ class DocsAsImagesAdapter(data: MutableList<Document>) :
         return R.layout.item_doc_as_image
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onDocClick(index: Int, doc: Document)
         fun onDocLongClick(index: Int, doc: Document): Boolean
     }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsListPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsListPresenter.kt
index de661e650..eb56304e5 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsListPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/docs/DocsListPresenter.kt
@@ -518,7 +518,7 @@ class DocsListPresenter(
             }
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadResults(it) })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadStatusUpdate(it) })
         appendDisposable(uploadManager.observeProgress()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackAdapter.kt
index 726560a61..167e5d5ea 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/feedback/FeedbackAdapter.kt
@@ -24,7 +24,6 @@ import dev.ragnarok.fenrir.model.feedback.ReplyCommentFeedback
 import dev.ragnarok.fenrir.model.feedback.UsersFeedback
 import dev.ragnarok.fenrir.view.OnlineView
 import java.util.Calendar
-import java.util.EventListener
 
 class FeedbackAdapter(
     context: Activity,
@@ -281,7 +280,7 @@ class FeedbackAdapter(
         }
     }
 
-    interface ClickListener : EventListener {
+    interface ClickListener {
         fun onNotificationClick(notification: Feedback)
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/filemanagerselect/FileManagerSelectFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/filemanagerselect/FileManagerSelectFragment.kt
index 11f46141c..8d50b35fb 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/filemanagerselect/FileManagerSelectFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/filemanagerselect/FileManagerSelectFragment.kt
@@ -37,7 +37,6 @@ import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
 import java.io.File
-import java.util.Collections
 import java.util.concurrent.TimeUnit
 
 class FileManagerSelectFragment :
@@ -140,7 +139,7 @@ class FileManagerSelectFragment :
         mHeader?.visibility =
             if (arguments?.getBoolean(Extra.HIDE_TITLE, false) == true) View.GONE else View.VISIBLE
 
-        mAdapter = FileManagerSelectAdapter(Collections.emptyList())
+        mAdapter = FileManagerSelectAdapter(emptyList())
         mAdapter?.setClickListener(this)
         mRecyclerView?.adapter = mAdapter
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/friends/friendsbyphones/FriendsByPhonesPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/friends/friendsbyphones/FriendsByPhonesPresenter.kt
index e0c177176..ae67ed79a 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/friends/friendsbyphones/FriendsByPhonesPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/friends/friendsbyphones/FriendsByPhonesPresenter.kt
@@ -20,7 +20,7 @@ import kotlinx.serialization.builtins.ListSerializer
 import java.io.File
 import java.io.FileInputStream
 import java.io.FileOutputStream
-import java.util.*
+import java.util.Locale
 
 class FriendsByPhonesPresenter(accountId: Long, context: Context, savedInstanceState: Bundle?) :
     AccountDependencyPresenter<IFriendsByPhonesView>(accountId, savedInstanceState) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupchats/GroupChatsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupchats/GroupChatsAdapter.kt
index 9acaf444f..bf931793f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupchats/GroupChatsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupchats/GroupChatsAdapter.kt
@@ -18,7 +18,6 @@ import dev.ragnarok.fenrir.settings.CurrentTheme
 import dev.ragnarok.fenrir.util.AppTextUtils
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.toast.CustomToast.Companion.createCustomToast
-import java.util.EventListener
 
 class GroupChatsAdapter(
     context: Context,
@@ -89,7 +88,7 @@ class GroupChatsAdapter(
         return R.layout.item_group_chat
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onGroupChatsClick(chat: GroupChats)
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallFragment.kt
index b1e91e728..62a0fcb3e 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallFragment.kt
@@ -514,7 +514,8 @@ class GroupWallFragment : AbsWallFragment<IGroupWallView, GroupWallPresenter>(),
         products: Int,
         chats: Int,
         products_services: Int,
-        narratives: Int
+        narratives: Int,
+        clips: Int
     ) {
         if (mHeaderHolder == null) return
         setupCounter(mHeaderHolder?.bTopics, topics)
@@ -527,6 +528,7 @@ class GroupWallFragment : AbsWallFragment<IGroupWallView, GroupWallPresenter>(),
         setupCounter(mHeaderHolder?.bProducts, products)
         setupCounter(mHeaderHolder?.bProductServices, products_services)
         setupCounter(mHeaderHolder?.bNarratives, narratives)
+        setupCounter(mHeaderHolder?.bClips, clips)
         setupCounterFlow(mHeaderHolder?.bChats, mHeaderHolder?.bChatsContainer, chats)
     }
 
@@ -581,6 +583,7 @@ class GroupWallFragment : AbsWallFragment<IGroupWallView, GroupWallPresenter>(),
         val bProducts: TextView = root.findViewById(R.id.header_group_bproducts)
         val bProductServices: TextView = root.findViewById(R.id.header_group_bservices_products)
         val bNarratives: TextView = root.findViewById(R.id.header_group_bnarratives)
+        val bClips: TextView = root.findViewById(R.id.header_group_bclips)
         val bMembers: TextView = root.findViewById(R.id.header_group_bmembers)
         val bDocuments: TextView = root.findViewById(R.id.header_group_bdocuments)
         val bPhotos: TextView = root.findViewById(R.id.header_group_bphotos)
@@ -692,6 +695,12 @@ class GroupWallFragment : AbsWallFragment<IGroupWallView, GroupWallPresenter>(),
                 .setOnClickListener {
                     presenter?.fireNarrativesClick()
                 }
+            root.findViewById<View>(R.id.header_group_clips_container).let {
+                it.setOnClickListener {
+                    presenter?.fireClipsClick()
+                }
+                it.visibility = if (Utils.isOfficialVKCurrent) View.VISIBLE else View.GONE
+            }
             bChatsContainer.setOnClickListener {
                 presenter?.fireGroupChatsClick()
             }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallPresenter.kt
index e49bb33ef..d92f8b9c8 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/GroupWallPresenter.kt
@@ -9,6 +9,7 @@ import dev.ragnarok.fenrir.api.model.VKApiCommunity
 import dev.ragnarok.fenrir.domain.ICommunitiesInteractor
 import dev.ragnarok.fenrir.domain.IFaveInteractor
 import dev.ragnarok.fenrir.domain.IOwnersRepository
+import dev.ragnarok.fenrir.domain.IStoriesShortVideosInteractor
 import dev.ragnarok.fenrir.domain.IWallsRepository
 import dev.ragnarok.fenrir.domain.InteractorFactory
 import dev.ragnarok.fenrir.domain.Repository.owners
@@ -46,6 +47,7 @@ class GroupWallPresenter(
     private val faveInteractor: IFaveInteractor
     private val ownersRepository: IOwnersRepository
     private val communitiesInteractor: ICommunitiesInteractor
+    private val storiesInteractor: IStoriesShortVideosInteractor
     private val wallsRepository: IWallsRepository
     private val filters: MutableList<PostFilter>
     private val menus: MutableList<CommunityDetails.Menu>
@@ -72,7 +74,8 @@ class GroupWallPresenter(
             details.getProductsCount(),
             details.getChatsCount(),
             details.getProductServicesCount(),
-            details.getNarrativesCount()
+            details.getNarrativesCount(),
+            details.getClipsCount()
         )
     }
 
@@ -570,7 +573,7 @@ class GroupWallPresenter(
     }
 
     override fun searchStory(ByName: Boolean) {
-        appendDisposable(ownersRepository.searchStory(
+        appendDisposable(storiesInteractor.searchStory(
             accountId,
             if (ByName) community.fullName else null,
             if (ByName) null else ownerId
@@ -595,6 +598,7 @@ class GroupWallPresenter(
         community = pCommunity ?: Community(abs(ownerId))
         details = CommunityDetails()
         ownersRepository = owners
+        storiesInteractor = InteractorFactory.createStoriesInteractor()
         faveInteractor = InteractorFactory.createFaveInteractor()
         communitiesInteractor = InteractorFactory.createCommunitiesInteractor()
         settings = Includes.settings.accounts()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/IGroupWallView.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/IGroupWallView.kt
index a19a988cf..64f84dae1 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/IGroupWallView.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/groupwall/IGroupWallView.kt
@@ -37,7 +37,8 @@ interface IGroupWallView : IWallView {
         products: Int,
         chats: Int,
         products_services: Int,
-        narratives: Int
+        narratives: Int,
+        clips: Int
     )
 
     fun invalidateOptionsMenu()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesFragment.kt
index c88a694bb..f8714aee3 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesFragment.kt
@@ -14,11 +14,7 @@ class LikesFragment : AbsOwnersListFragment<LikesListPresenter, ISimpleOwnersVie
         super.onResume()
         val actionBar = supportToolbarFor(this)
         if (actionBar != null) {
-            if (requireArguments().getString(Extra.TYPE) == "stories_view") {
-                actionBar.setTitle(R.string.views)
-            } else {
-                actionBar.setTitle(if ("likes" == requireArguments().getString(Extra.FILTER)) R.string.like else R.string.shared)
-            }
+            actionBar.setTitle(if ("likes" == requireArguments().getString(Extra.FILTER)) R.string.like else R.string.shared)
             actionBar.subtitle = null
         }
         ActivityFeatures.Builder()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesListPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesListPresenter.kt
index e10073190..186a4e4ea 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesListPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/LikesListPresenter.kt
@@ -29,39 +29,22 @@ class LikesListPresenter(
         loadingNow = true
         //this.loadingOffset = offset;
         resolveRefreshingView()
-        if (type == "stories_view") {
-            netDisposable.add(likesInteractor.getStoriesViewers(
-                accountId,
-                ownerId,
-                itemId,
-                50,
-                offset
-            )
-                .fromIOToMain()
-                .subscribe({ owners ->
-                    onDataReceived(
-                        offset,
-                        owners
-                    )
-                }) { t -> onDataGetError(t) })
-        } else {
-            netDisposable.add(likesInteractor.getLikes(
-                accountId,
-                type,
-                ownerId,
-                itemId,
-                filter,
-                50,
-                offset
-            )
-                .fromIOToMain()
-                .subscribe({ owners ->
-                    onDataReceived(
-                        offset,
-                        owners
-                    )
-                }) { t -> onDataGetError(t) })
-        }
+        netDisposable.add(likesInteractor.getLikes(
+            accountId,
+            type,
+            ownerId,
+            itemId,
+            filter,
+            50,
+            offset
+        )
+            .fromIOToMain()
+            .subscribe({ owners ->
+                onDataReceived(
+                    offset,
+                    owners
+                )
+            }) { t -> onDataGetError(t) })
     }
 
     private fun onDataGetError(t: Throwable) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/IStoriesViewView.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/IStoriesViewView.kt
new file mode 100644
index 000000000..bc835ef37
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/IStoriesViewView.kt
@@ -0,0 +1,16 @@
+package dev.ragnarok.fenrir.fragment.likes.storiesview
+
+import androidx.annotation.StringRes
+import dev.ragnarok.fenrir.fragment.base.core.IErrorView
+import dev.ragnarok.fenrir.fragment.base.core.IMvpView
+import dev.ragnarok.fenrir.model.Owner
+
+interface IStoriesViewView : IMvpView, IErrorView {
+    fun displayOwnerList(owners: List<Pair<Owner, Boolean>>)
+    fun notifyDataSetChanged()
+    fun notifyDataAdded(position: Int, count: Int)
+    fun notifyDataRemoved(position: Int, count: Int)
+    fun displayRefreshing(refreshing: Boolean)
+    fun showOwnerWall(accountId: Long, owner: Owner)
+    fun updateTitle(@StringRes res: Int)
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewAdapter.kt
new file mode 100644
index 000000000..16581edeb
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewAdapter.kt
@@ -0,0 +1,180 @@
+package dev.ragnarok.fenrir.fragment.likes.storiesview
+
+import android.content.Context
+import android.graphics.Color
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import com.squareup.picasso3.Transformation
+import dev.ragnarok.fenrir.Constants
+import dev.ragnarok.fenrir.R
+import dev.ragnarok.fenrir.activity.SelectionUtils.addSelectionProfileSupport
+import dev.ragnarok.fenrir.fragment.communities.CommunitiesAdapter.Companion.getCommunityType
+import dev.ragnarok.fenrir.model.Community
+import dev.ragnarok.fenrir.model.Owner
+import dev.ragnarok.fenrir.model.User
+import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
+import dev.ragnarok.fenrir.settings.CurrentTheme
+import dev.ragnarok.fenrir.util.AppTextUtils
+import dev.ragnarok.fenrir.util.UserInfoResolveUtil
+import dev.ragnarok.fenrir.util.Utils
+import dev.ragnarok.fenrir.util.ViewUtils
+import dev.ragnarok.fenrir.util.ViewUtils.displayAvatar
+import dev.ragnarok.fenrir.view.OnlineView
+
+class StoriesViewAdapter(
+    private val mContext: Context,
+    private var mData: List<Pair<Owner, Boolean>>
+) :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    private val transformation: Transformation = CurrentTheme.createTransformationForAvatar()
+    private val transformationWithStory: Transformation =
+        CurrentTheme.createTransformationStrokeForAvatar()
+    private var mClickListener: ClickListener? = null
+    private var longClickListener: LongClickListener? = null
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        when (viewType) {
+            TYPE_USER -> return PeopleHolder(
+                LayoutInflater.from(mContext).inflate(R.layout.item_people_with_like, parent, false)
+            )
+
+            TYPE_COMMUNITY -> return CommunityHolder(
+                LayoutInflater.from(mContext).inflate(R.layout.item_group_with_like, parent, false)
+            )
+        }
+        throw RuntimeException("StoriesViewAdapter.onCreateViewHolder")
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (getItemViewType(position)) {
+            TYPE_USER -> bindUserHolder(
+                holder as PeopleHolder,
+                mData[position].first as User,
+                mData[position].second
+            )
+
+            TYPE_COMMUNITY -> bindCommunityHolder(
+                holder as CommunityHolder,
+                mData[position].first as Community,
+                mData[position].second
+            )
+        }
+    }
+
+    private fun bindCommunityHolder(holder: CommunityHolder, community: Community, liked: Boolean) {
+        holder.tvName.text = community.fullName
+        holder.tvName.setTextColor(Utils.getVerifiedColor(mContext, community.isVerified))
+        holder.ivVerified.visibility = if (community.isVerified) View.VISIBLE else View.GONE
+        holder.liked.visibility = if (liked) View.VISIBLE else View.GONE
+        holder.tvType.text = getCommunityType(mContext, community)
+        holder.tvMembersCount.text = mContext.getString(
+            R.string.members_count,
+            if (community.membersCount > 0) AppTextUtils.getCounterWithK(community.membersCount) else "-"
+        )
+        with()
+            .load(community.maxSquareAvatar)
+            .tag(Constants.PICASSO_TAG)
+            .transform(if (community.hasUnseenStories) transformationWithStory else transformation)
+            .into(holder.ivAvatar)
+        holder.itemView.setOnClickListener {
+            mClickListener?.onOwnerClick(community)
+        }
+        holder.itemView.setOnLongClickListener {
+            longClickListener?.onOwnerLongClick(
+                community
+            ) == true
+        }
+    }
+
+    private fun bindUserHolder(holder: PeopleHolder, user: User, liked: Boolean) {
+        holder.name.text = user.fullName
+        holder.name.setTextColor(Utils.getVerifiedColor(mContext, user.isVerified))
+        holder.ivVerified.visibility = if (user.isVerified) View.VISIBLE else View.GONE
+        holder.blacklisted.visibility = if (user.blacklisted) View.VISIBLE else View.GONE
+        holder.subtitle.text = UserInfoResolveUtil.getUserActivityLine(mContext, user, true)
+        holder.subtitle.setTextColor(if (user.isOnline) CurrentTheme.getColorPrimary(mContext) else STATUS_COLOR_OFFLINE)
+        holder.liked.visibility = if (liked) View.VISIBLE else View.GONE
+        holder.online.visibility = if (user.isOnline) View.VISIBLE else View.GONE
+        val onlineIcon =
+            ViewUtils.getOnlineIcon(
+                user.isOnline,
+                user.isOnlineMobile,
+                user.platform,
+                user.onlineApp
+            )
+        holder.online.setIcon(onlineIcon ?: 0)
+        val avaUrl = user.maxSquareAvatar
+        displayAvatar(
+            holder.avatar,
+            if (user.hasUnseenStories) transformationWithStory else transformation,
+            avaUrl,
+            Constants.PICASSO_TAG,
+            monochrome = user.blacklisted
+        )
+        holder.itemView.setOnClickListener {
+            mClickListener?.onOwnerClick(user)
+        }
+        holder.itemView.setOnLongClickListener {
+            longClickListener?.onOwnerLongClick(
+                user
+            ) == true
+        }
+        addSelectionProfileSupport(mContext, holder.avatarRoot, user)
+    }
+
+    override fun getItemCount(): Int {
+        return mData.size
+    }
+
+    fun setItems(data: List<Pair<Owner, Boolean>>) {
+        mData = data
+        notifyDataSetChanged()
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (mData[position].first is User) TYPE_USER else TYPE_COMMUNITY
+    }
+
+    fun setClickListener(clickListener: ClickListener?) {
+        mClickListener = clickListener
+    }
+
+    interface ClickListener {
+        fun onOwnerClick(owner: Owner)
+    }
+
+    interface LongClickListener {
+        fun onOwnerLongClick(owner: Owner): Boolean
+    }
+
+    private class CommunityHolder(root: View) : RecyclerView.ViewHolder(root) {
+        val tvName: TextView = root.findViewById(R.id.item_group_name)
+        val tvType: TextView = root.findViewById(R.id.item_group_type)
+        val tvMembersCount: TextView = root.findViewById(R.id.item_group_members)
+        val ivAvatar: ImageView = root.findViewById(R.id.item_group_avatar)
+        val ivVerified: ImageView = itemView.findViewById(R.id.item_verified)
+        val liked: ImageView = itemView.findViewById(R.id.item_group_liked)
+    }
+
+    private class PeopleHolder(itemView: View) :
+        RecyclerView.ViewHolder(itemView) {
+        val name: TextView = itemView.findViewById(R.id.item_people_name)
+        val subtitle: TextView = itemView.findViewById(R.id.item_people_subtitle)
+        val avatar: ImageView = itemView.findViewById(R.id.item_people_avatar)
+        val liked: ImageView = itemView.findViewById(R.id.item_people_liked)
+        val ivVerified: ImageView = itemView.findViewById(R.id.item_verified)
+        val avatarRoot: ViewGroup = itemView.findViewById(R.id.avatar_root)
+        val blacklisted: ImageView = itemView.findViewById(R.id.item_blacklisted)
+        val online: OnlineView = itemView.findViewById(R.id.item_people_online)
+    }
+
+    companion object {
+        private val STATUS_COLOR_OFFLINE = Color.parseColor("#999999")
+        private const val TYPE_USER = 0
+        private const val TYPE_COMMUNITY = 1
+    }
+
+}
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewFragment.kt
new file mode 100644
index 000000000..49760fb73
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewFragment.kt
@@ -0,0 +1,160 @@
+package dev.ragnarok.fenrir.fragment.likes.storiesview
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AppCompatActivity
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+import com.google.android.material.textview.MaterialTextView
+import dev.ragnarok.fenrir.Constants
+import dev.ragnarok.fenrir.Extra
+import dev.ragnarok.fenrir.R
+import dev.ragnarok.fenrir.activity.ActivityFeatures
+import dev.ragnarok.fenrir.activity.ActivityUtils.supportToolbarFor
+import dev.ragnarok.fenrir.fragment.base.BaseMvpFragment
+import dev.ragnarok.fenrir.fragment.base.core.IPresenterFactory
+import dev.ragnarok.fenrir.listener.EndlessRecyclerOnScrollListener
+import dev.ragnarok.fenrir.listener.PicassoPauseOnScrollListener
+import dev.ragnarok.fenrir.model.Owner
+import dev.ragnarok.fenrir.place.PlaceFactory
+import dev.ragnarok.fenrir.util.ViewUtils
+
+class StoriesViewFragment : BaseMvpFragment<StoriesViewPresenter, IStoriesViewView>(),
+    IStoriesViewView {
+    private var mRecyclerView: RecyclerView? = null
+    private var mSwipeRefreshLayout: SwipeRefreshLayout? = null
+
+    private var mOwnersAdapter: StoriesViewAdapter? = null
+    private var mLinearLayoutManager: LinearLayoutManager? = null
+    private var mCount: MaterialTextView? = null
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val root = inflater.inflate(
+            R.layout.fragment_abs_friends_with_toolbar,
+            container,
+            false
+        )
+        (requireActivity() as AppCompatActivity).setSupportActionBar(root.findViewById(R.id.toolbar))
+        mRecyclerView = root.findViewById(R.id.list)
+        mSwipeRefreshLayout = root.findViewById(R.id.refresh)
+        mCount = root.findViewById(R.id.count_data)
+        mCount?.visibility = View.VISIBLE
+        mSwipeRefreshLayout?.setOnRefreshListener {
+            presenter?.fireRefresh()
+        }
+        ViewUtils.setupSwipeRefreshLayoutWithCurrentTheme(requireActivity(), mSwipeRefreshLayout)
+        mLinearLayoutManager =
+            LinearLayoutManager(requireActivity(), LinearLayoutManager.VERTICAL, false)
+        mRecyclerView?.layoutManager = mLinearLayoutManager
+        mRecyclerView?.addOnScrollListener(PicassoPauseOnScrollListener(Constants.PICASSO_TAG))
+        mRecyclerView?.addOnScrollListener(object : EndlessRecyclerOnScrollListener() {
+            override fun onScrollToLastElement() {
+                presenter?.fireScrollToEnd()
+            }
+        })
+        mOwnersAdapter = StoriesViewAdapter(requireActivity(), emptyList())
+        mOwnersAdapter?.setClickListener(object : StoriesViewAdapter.ClickListener {
+            override fun onOwnerClick(owner: Owner) {
+                presenter?.fireOwnerClick(owner)
+            }
+        })
+        mRecyclerView?.adapter = mOwnersAdapter
+        return root
+    }
+
+    override fun displayOwnerList(owners: List<Pair<Owner, Boolean>>) {
+        if (mOwnersAdapter != null) {
+            mOwnersAdapter?.setItems(owners)
+            mCount?.text = getString(R.string.people_count, owners.size)
+        }
+    }
+
+    override fun updateTitle(@StringRes res: Int) {
+        val actionBar = supportToolbarFor(this)
+        actionBar?.setTitle(res)
+    }
+
+    override fun notifyDataSetChanged() {
+        if (mOwnersAdapter != null) {
+            mOwnersAdapter?.notifyDataSetChanged()
+            mCount?.text = getString(R.string.people_count, mOwnersAdapter?.itemCount ?: 0)
+        }
+    }
+
+    override fun notifyDataAdded(position: Int, count: Int) {
+        if (mOwnersAdapter != null) {
+            mOwnersAdapter?.notifyItemRangeInserted(position, count)
+            mCount?.text = getString(R.string.people_count, mOwnersAdapter?.itemCount ?: 0)
+        }
+    }
+
+    override fun notifyDataRemoved(position: Int, count: Int) {
+        if (mOwnersAdapter != null) {
+            mOwnersAdapter?.notifyItemRangeRemoved(position, count)
+            mCount?.text = getString(R.string.people_count, mOwnersAdapter?.itemCount ?: 0)
+        }
+    }
+
+    override fun displayRefreshing(refreshing: Boolean) {
+        mSwipeRefreshLayout?.isRefreshing = refreshing
+    }
+
+    override fun showOwnerWall(accountId: Long, owner: Owner) {
+        PlaceFactory.getOwnerWallPlace(accountId, owner).tryOpenWith(requireActivity())
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val actionBar = supportToolbarFor(this)
+        if (actionBar != null) {
+            actionBar.setTitle(R.string.views)
+            actionBar.subtitle = null
+        }
+        ActivityFeatures.Builder()
+            .begin()
+            .setHideNavigationMenu(false)
+            .setBarsColored(requireActivity(), true)
+            .build()
+            .apply(requireActivity())
+    }
+
+    override fun getPresenterFactory(saveInstanceState: Bundle?): IPresenterFactory<StoriesViewPresenter> {
+        return object : IPresenterFactory<StoriesViewPresenter> {
+            override fun create(): StoriesViewPresenter {
+                return StoriesViewPresenter(
+                    requireArguments().getLong(Extra.ACCOUNT_ID),
+                    requireArguments().getLong(Extra.OWNER_ID),
+                    requireArguments().getInt(Extra.ITEM_ID),
+                    saveInstanceState
+                )
+            }
+        }
+    }
+
+    companion object {
+        fun buildArgs(
+            accountId: Long,
+            ownerId: Long,
+            itemId: Int
+        ): Bundle {
+            val args = Bundle()
+            args.putLong(Extra.ACCOUNT_ID, accountId)
+            args.putLong(Extra.OWNER_ID, ownerId)
+            args.putInt(Extra.ITEM_ID, itemId)
+            return args
+        }
+
+        fun newInstance(args: Bundle): StoriesViewFragment {
+            val fragment = StoriesViewFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewPresenter.kt
new file mode 100644
index 000000000..c860d5650
--- /dev/null
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/likes/storiesview/StoriesViewPresenter.kt
@@ -0,0 +1,118 @@
+package dev.ragnarok.fenrir.fragment.likes.storiesview
+
+import android.os.Bundle
+import dev.ragnarok.fenrir.domain.IStoriesShortVideosInteractor
+import dev.ragnarok.fenrir.domain.InteractorFactory
+import dev.ragnarok.fenrir.fragment.base.AccountDependencyPresenter
+import dev.ragnarok.fenrir.fromIOToMain
+import dev.ragnarok.fenrir.model.Owner
+import dev.ragnarok.fenrir.nonNullNoEmpty
+import dev.ragnarok.fenrir.util.Utils.getCauseIfRuntime
+import io.reactivex.rxjava3.disposables.CompositeDisposable
+
+class StoriesViewPresenter(
+    accountId: Long,
+    private val ownerId: Long,
+    private val itemId: Int,
+    savedInstanceState: Bundle?
+) : AccountDependencyPresenter<IStoriesViewView>(accountId, savedInstanceState) {
+    val data: MutableList<Pair<Owner, Boolean>> = ArrayList()
+    private val storiesInteractor: IStoriesShortVideosInteractor =
+        InteractorFactory.createStoriesInteractor()
+    private val netDisposable = CompositeDisposable()
+    private var endOfContent = false
+    private var loadingNow = false
+
+    override fun onGuiCreated(viewHost: IStoriesViewView) {
+        super.onGuiCreated(viewHost)
+        viewHost.displayOwnerList(data)
+    }
+
+    fun fireRefresh() {
+        onUserRefreshed()
+    }
+
+    fun fireScrollToEnd() {
+        onUserScrolledToEnd()
+    }
+
+    fun fireOwnerClick(owner: Owner) {
+        view?.showOwnerWall(accountId, owner)
+    }
+
+    //private int loadingOffset;
+    private fun requestData(offset: Int) {
+        loadingNow = true
+        //this.loadingOffset = offset;
+        resolveRefreshingView()
+        netDisposable.add(storiesInteractor.getStoriesViewers(
+            accountId,
+            ownerId,
+            itemId,
+            50,
+            offset
+        )
+            .fromIOToMain()
+            .subscribe({ owners ->
+                onDataReceived(
+                    offset,
+                    owners
+                )
+            }) { t -> onDataGetError(t) })
+    }
+
+    private fun onDataGetError(t: Throwable) {
+        showError(getCauseIfRuntime(t))
+        loadingNow = false
+        resolveRefreshingView()
+    }
+
+    private fun onDataReceived(offset: Int, owners: List<Pair<Owner, Boolean>>) {
+        loadingNow = false
+        endOfContent = owners.isEmpty()
+        if (offset == 0) {
+            data.clear()
+            data.addAll(owners)
+            view?.notifyDataSetChanged()
+        } else {
+            val sizeBefore = data.size
+            data.addAll(owners)
+            view?.notifyDataAdded(
+                sizeBefore,
+                owners.size
+            )
+        }
+        resolveRefreshingView()
+    }
+
+    public override fun onGuiResumed() {
+        super.onGuiResumed()
+        resolveRefreshingView()
+    }
+
+    private fun resolveRefreshingView() {
+        resumedView?.displayRefreshing(
+            loadingNow
+        )
+    }
+
+    override fun onDestroyed() {
+        netDisposable.dispose()
+        super.onDestroyed()
+    }
+
+    private fun onUserRefreshed() {
+        netDisposable.clear()
+        requestData(0)
+    }
+
+    private fun onUserScrolledToEnd() {
+        if (!loadingNow && !endOfContent && data.nonNullNoEmpty()) {
+            requestData(data.size)
+        }
+    }
+
+    init {
+        requestData(0)
+    }
+}
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt
index 27b1f0dd5..dcb72622d 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt
@@ -50,7 +50,6 @@ import dev.ragnarok.fenrir.view.MySearchView
 import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
-import java.util.Collections
 import java.util.concurrent.TimeUnit
 
 class FileManagerRemoteFragment :
@@ -154,7 +153,7 @@ class FileManagerRemoteFragment :
         }
         ViewUtils.setupSwipeRefreshLayoutWithCurrentTheme(requireActivity(), mSwipeRefreshLayout)
 
-        mAdapter = FileManagerRemoteAdapter(requireActivity(), Collections.emptyList())
+        mAdapter = FileManagerRemoteAdapter(requireActivity(), emptyList())
         mAdapter?.setClickListener(this)
         mRecyclerView?.adapter = mAdapter
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/logs/LogsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/logs/LogsAdapter.kt
index ffc48e9cc..6867e787c 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/logs/LogsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/logs/LogsAdapter.kt
@@ -9,7 +9,6 @@ import dev.ragnarok.fenrir.model.LogEventWrapper
 import dev.ragnarok.fenrir.orZero
 import dev.ragnarok.fenrir.util.AppTextUtils
 import dev.ragnarok.fenrir.util.Utils
-import java.util.EventListener
 
 class LogsAdapter(data: MutableList<LogEventWrapper>, private val actionListener: ActionListener) :
     RecyclerBindableAdapter<LogEventWrapper, LogsAdapter.Holder>(data) {
@@ -56,7 +55,7 @@ class LogsAdapter(data: MutableList<LogEventWrapper>, private val actionListener
         return R.layout.item_log
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onShareClick(wrapper: LogEventWrapper)
         fun onCopyClick(wrapper: LogEventWrapper)
     }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt
index b17c1a663..a683391fb 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatFragment.kt
@@ -78,7 +78,6 @@ import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
 import me.minetsh.imaging.IMGEditActivity
 import java.io.File
 import java.lang.ref.WeakReference
-import java.util.*
 
 class ChatFragment : PlaceSupportMvpFragment<ChatPresenter, IChatView>(), IChatView,
     InputViewController.OnInputActionCallback,
@@ -237,7 +236,7 @@ class ChatFragment : PlaceSupportMvpFragment<ChatPresenter, IChatView>(), IChatV
         }
 
         stickersKeywordsView = root.findViewById(R.id.stickers)
-        stickersAdapter = StickersKeyWordsAdapter(requireActivity(), Collections.emptyList())
+        stickersAdapter = StickersKeyWordsAdapter(requireActivity(), emptyList())
         stickersAdapter?.setStickerClickedListener(object :
             EmojiconsPopup.OnStickerClickedListener {
             override fun onStickerClick(sticker: Sticker) {
@@ -1092,10 +1091,10 @@ class ChatFragment : PlaceSupportMvpFragment<ChatPresenter, IChatView>(), IChatV
             if (result.data != null && result.resultCode == RESULT_OK) {
                 val vkphotos: List<Photo> =
                     result.data?.getParcelableArrayListExtraCompat(Extra.ATTACHMENTS)
-                        ?: Collections.emptyList()
+                        ?: emptyList()
                 val localPhotos: List<LocalPhoto> =
                     result.data?.getParcelableArrayListExtraCompat(Extra.PHOTOS)
-                        ?: Collections.emptyList()
+                        ?: emptyList()
 
                 val vid: LocalVideo? = result.data?.getParcelableExtraCompat(Extra.VIDEO)
 
@@ -1130,7 +1129,7 @@ class ChatFragment : PlaceSupportMvpFragment<ChatPresenter, IChatView>(), IChatV
             if (result.data != null && result.resultCode == RESULT_OK) {
                 val attachments: List<AbsModel> =
                     result.data?.getParcelableArrayListExtraCompat(Extra.ATTACHMENTS)
-                        ?: Collections.emptyList()
+                        ?: emptyList()
                 presenter?.fireEditAttachmentsSelected(attachments)
             }
         }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatPresenter.kt
index 376c22b35..a09ac8285 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/chat/ChatPresenter.kt
@@ -46,7 +46,6 @@ import dev.ragnarok.fenrir.settings.ISettings
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.upload.*
 import dev.ragnarok.fenrir.util.*
-import dev.ragnarok.fenrir.util.Optional
 import dev.ragnarok.fenrir.util.PersistentLogger.logThrowable
 import dev.ragnarok.fenrir.util.Utils.addElementToList
 import dev.ragnarok.fenrir.util.Utils.countOfSelection
@@ -67,7 +66,6 @@ import io.reactivex.rxjava3.functions.Consumer
 import io.reactivex.rxjava3.functions.Predicate
 import java.io.*
 import java.lang.ref.WeakReference
-import java.util.*
 import java.util.concurrent.TimeUnit
 
 class ChatPresenter(
@@ -239,7 +237,7 @@ class ChatPresenter(
         )
 
         appendDisposable(
-            uploadManager.obseveStatus()
+            uploadManager.observeStatus()
                 .toMainThread()
                 .subscribe({ onUploadStatusChange(it) }, ignore())
         )
@@ -332,7 +330,7 @@ class ChatPresenter(
 
             }
         }
-        fireForwardToHereClick(ArrayList(Collections.singleton(data[position])))
+        fireForwardToHereClick(arrayListOf(data[position]))
     }
 
     fun fireTranscript(voiceMessageId: String, messageId: Int) {
@@ -445,8 +443,9 @@ class ChatPresenter(
 
         if (!refresh) {
             loadAllCachedData()
+        } else {
+            requestAtStart()
         }
-        requestAtStart()
     }
 
     private fun onUploadProgressUpdate(data: List<IUploadManager.IProgressUpdate>) {
@@ -631,12 +630,13 @@ class ChatPresenter(
             .fromIOToMain()
             .subscribe(
                 { onCachedDataReceived(it) },
-                { onCachedDataReceived(Collections.emptyList()) })
+                { onCachedDataReceived(emptyList()) })
     }
 
     private fun onCachedDataReceived(data: List<Message>) {
         setCacheLoadingNow(false)
         onAllDataLoaded(data, appendToList = false, isCache = true)
+        requestAtStart()
     }
 
     private fun onNetDataReceived(messages: List<Message>, startMessageId: Int?) {
@@ -838,7 +838,7 @@ class ChatPresenter(
         }
         stickersWordsDisplayDisposable.dispose()
         if (s.isNullOrEmpty()) {
-            view?.updateStickers(Collections.emptyList())
+            view?.updateStickers(emptyList())
             return
         }
         stickersWordsDisplayDisposable =
@@ -1853,7 +1853,7 @@ class ChatPresenter(
         appendDisposable(
             messagesRepository.edit(
                 messagesOwnerId, message, "Ragnarök",
-                Collections.emptyList(), false
+                emptyList(), false
             )
                 .fromIOToMain()
                 .subscribe({
@@ -2524,7 +2524,7 @@ class ChatPresenter(
                 pFileUri = Uri.parse(video.getData().toString())
             }
 
-            uploadManager.enqueue(Collections.singletonList(intents))
+            uploadManager.enqueue(listOf(intents))
         }
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/dialogs/DialogsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/dialogs/DialogsAdapter.kt
index 4f3ab62bb..05adeaccb 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/dialogs/DialogsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/messages/dialogs/DialogsAdapter.kt
@@ -29,7 +29,7 @@ import dev.ragnarok.fenrir.util.ViewUtils.displayAvatar
 import dev.ragnarok.fenrir.util.ViewUtils.getOnlineIcon
 import dev.ragnarok.fenrir.view.OnlineView
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
 
 class DialogsAdapter(private val mContext: Context, private var mDialogs: List<Dialog>) :
     RecyclerView.Adapter<RecyclerView.ViewHolder>() {
@@ -402,7 +402,7 @@ class DialogsAdapter(private val mContext: Context, private var mDialogs: List<D
         return mDialogs.size
     }
 
-    interface ClickListener : EventListener {
+    interface ClickListener {
         fun onDialogClick(dialog: Dialog)
         fun onDialogLongClick(dialog: Dialog): Boolean
         fun onAvatarClick(dialog: Dialog)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/narratives/NarrativesPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/narratives/NarrativesPresenter.kt
index d2654bea9..82579fe25 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/narratives/NarrativesPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/narratives/NarrativesPresenter.kt
@@ -2,8 +2,8 @@ package dev.ragnarok.fenrir.fragment.narratives
 
 import android.content.Context
 import android.os.Bundle
-import dev.ragnarok.fenrir.domain.IOwnersRepository
-import dev.ragnarok.fenrir.domain.Repository.owners
+import dev.ragnarok.fenrir.domain.IStoriesShortVideosInteractor
+import dev.ragnarok.fenrir.domain.InteractorFactory
 import dev.ragnarok.fenrir.fragment.base.AccountDependencyPresenter
 import dev.ragnarok.fenrir.fromIOToMain
 import dev.ragnarok.fenrir.model.Narratives
@@ -16,7 +16,8 @@ class NarrativesPresenter(
     private val context: Context,
     savedInstanceState: Bundle?
 ) : AccountDependencyPresenter<INarrativesView>(accountId, savedInstanceState) {
-    private val ownerInteractor: IOwnersRepository = owners
+    private val storiesInteractor: IStoriesShortVideosInteractor =
+        InteractorFactory.createStoriesInteractor()
     private val mNarratives: ArrayList<Narratives> = ArrayList()
     private val netDisposable = CompositeDisposable()
     private var mEndOfContent = false
@@ -35,7 +36,7 @@ class NarrativesPresenter(
     private fun request(offset: Int) {
         netLoadingNow = true
         resolveRefreshingView()
-        netDisposable.add(ownerInteractor.getNarratives(
+        netDisposable.add(storiesInteractor.getNarratives(
             accountId,
             owner_id,
             null,
@@ -103,7 +104,7 @@ class NarrativesPresenter(
         resolveRefreshingView()
 
         appendDisposable(
-            ownerInteractor.getStoryById(accountId, narrative.getStoriesIds())
+            storiesInteractor.getStoryById(accountId, narrative.getStoriesIds())
                 .fromIOToMain()
                 .subscribe({
                     netLoadingNow = false
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/requestexecute/RequestExecutePresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/requestexecute/RequestExecutePresenter.kt
index 58fc5c45c..2cb7f867f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/requestexecute/RequestExecutePresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/requestexecute/RequestExecutePresenter.kt
@@ -28,7 +28,7 @@ import kotlinx.serialization.encodeToString
 import okhttp3.ResponseBody
 import java.io.File
 import java.io.FileOutputStream
-import java.util.*
+import java.util.Locale
 
 class RequestExecutePresenter(accountId: Long, savedInstanceState: Bundle?) :
     AccountDependencyPresenter<IRequestExecuteView>(accountId, savedInstanceState) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/dialogssearch/DialogPreviewAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/dialogssearch/DialogPreviewAdapter.kt
index a7fe0b365..0b6c046ec 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/dialogssearch/DialogPreviewAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/dialogssearch/DialogPreviewAdapter.kt
@@ -17,7 +17,6 @@ import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
 import dev.ragnarok.fenrir.settings.CurrentTheme
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.ViewUtils.displayAvatar
-import java.util.EventListener
 
 class DialogPreviewAdapter(
     private var mData: List<Conversation>,
@@ -77,7 +76,7 @@ class DialogPreviewAdapter(
         notifyDataSetChanged()
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onEntryClick(o: Conversation)
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/filteredit/FilterEditFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/filteredit/FilterEditFragment.kt
index e0d8bbabf..744ab2b74 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/filteredit/FilterEditFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/search/filteredit/FilterEditFragment.kt
@@ -40,7 +40,9 @@ import dev.ragnarok.fenrir.util.Utils.hasMarshmallow
 import dev.ragnarok.fenrir.util.toast.CustomToast.Companion.createCustomToast
 import dev.ragnarok.fenrir.view.DateTimePicker
 import io.reactivex.rxjava3.disposables.CompositeDisposable
-import java.util.*
+import java.util.Calendar
+import java.util.Timer
+import java.util.TimerTask
 
 class FilterEditFragment : BottomSheetDialogFragment(), OptionClickListener {
     private val mCompositeDisposable = CompositeDisposable()
@@ -80,7 +82,7 @@ class FilterEditFragment : BottomSheetDialogFragment(), OptionClickListener {
         val manager: RecyclerView.LayoutManager =
             LinearLayoutManager(requireActivity(), RecyclerView.VERTICAL, false)
         mRecyclerView.layoutManager = manager
-        mAdapter = SearchOptionsAdapter(mData ?: Collections.emptyList())
+        mAdapter = SearchOptionsAdapter(mData ?: mutableListOf())
         mAdapter?.setOptionClickListener(this)
         mRecyclerView.adapter = mAdapter
         resolveEmptyTextVisibility()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/AttachmentsBottomSheetAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/AttachmentsBottomSheetAdapter.kt
index e7ebd8203..4da242fe6 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/AttachmentsBottomSheetAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/AttachmentsBottomSheetAdapter.kt
@@ -19,7 +19,6 @@ import dev.ragnarok.fenrir.settings.CurrentTheme
 import dev.ragnarok.fenrir.upload.Upload
 import dev.ragnarok.fenrir.util.AppTextUtils
 import dev.ragnarok.fenrir.view.CircleRoadProgress
-import java.util.*
 
 class AttachmentsBottomSheetAdapter(
     private val data: List<AttachmentEntry>,
@@ -408,7 +407,7 @@ class AttachmentsBottomSheetAdapter(
         return nextHolderId
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onAddPhotoButtonClick()
         fun onButtonRemoveClick(entry: AttachmentEntry)
         fun onButtonRetryClick(entry: AttachmentEntry)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/MessageAttachmentsPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/MessageAttachmentsPresenter.kt
index be9b2e555..d3308f273 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/MessageAttachmentsPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/sheet/MessageAttachmentsPresenter.kt
@@ -590,7 +590,7 @@ class MessageAttachmentsPresenter(
         appendDisposable(uploadManager.observeDeleting(true)
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadsRemoved(it) })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadStatusChanges(it) })
         appendDisposable(uploadManager.observeProgress()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/topics/TopicsAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/topics/TopicsAdapter.kt
index 21c9ae148..23223eac5 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/topics/TopicsAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/topics/TopicsAdapter.kt
@@ -18,7 +18,6 @@ import dev.ragnarok.fenrir.settings.CurrentTheme
 import dev.ragnarok.fenrir.util.AppTextUtils
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.toast.CustomToast.Companion.createCustomToast
-import java.util.EventListener
 
 class TopicsAdapter(
     context: Context,
@@ -88,7 +87,7 @@ class TopicsAdapter(
         return R.layout.item_topic
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onTopicClick(topic: Topic)
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/IUserWallView.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/IUserWallView.kt
index 954ce28f4..a8f15eade 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/IUserWallView.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/IUserWallView.kt
@@ -1,12 +1,10 @@
 package dev.ragnarok.fenrir.fragment.userwall
 
-import android.net.Uri
 import androidx.annotation.DrawableRes
 import dev.ragnarok.fenrir.fragment.abswall.IWallView
 import dev.ragnarok.fenrir.fragment.base.core.IProgressView
 import dev.ragnarok.fenrir.model.FriendsCounters
 import dev.ragnarok.fenrir.model.Owner
-import dev.ragnarok.fenrir.model.Post
 import dev.ragnarok.fenrir.model.PostFilter
 import dev.ragnarok.fenrir.model.User
 import dev.ragnarok.fenrir.model.UserDetails
@@ -38,15 +36,14 @@ interface IUserWallView : IWallView, IProgressView {
         products: Int,
         gifts: Int,
         products_services: Int,
-        narratives: Int
+        narratives: Int,
+        clips: Int
     )
 
     fun displayUserStatus(statusText: String?, swAudioIcon: Boolean)
     fun invalidateOptionsMenu()
     fun displayBaseUserInfo(user: User)
     fun openUserDetails(accountId: Long, user: User, details: UserDetails)
-    fun showAvatarUploadedMessage(accountId: Long, post: Post)
-    fun doEditPhoto(uri: Uri)
     fun showRegistrationDate(date: String)
     fun displayUserCover(blacklisted: Boolean, resource: String?, supportOpen: Boolean)
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallFragment.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallFragment.kt
index 84591c415..cb4df5748 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallFragment.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallFragment.kt
@@ -30,7 +30,6 @@ import com.yalantis.ucrop.UCrop
 import dev.ragnarok.fenrir.*
 import dev.ragnarok.fenrir.activity.ActivityUtils.setToolbarSubtitle
 import dev.ragnarok.fenrir.activity.ActivityUtils.setToolbarTitle
-import dev.ragnarok.fenrir.activity.DualTabPhotoActivity.Companion.createIntent
 import dev.ragnarok.fenrir.activity.PhotosActivity
 import dev.ragnarok.fenrir.fragment.abswall.AbsWallFragment
 import dev.ragnarok.fenrir.fragment.base.core.IPresenterFactory
@@ -46,13 +45,11 @@ import dev.ragnarok.fenrir.place.PlaceFactory.getFriendsFollowersPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getGiftsPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getMarketPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getMentionsPlace
-import dev.ragnarok.fenrir.place.PlaceFactory.getPostPreviewPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getSingleURLPhotoPlace
 import dev.ragnarok.fenrir.place.PlaceFactory.getUserDetailsPlace
 import dev.ragnarok.fenrir.settings.AvatarStyle
 import dev.ragnarok.fenrir.settings.CurrentTheme
 import dev.ragnarok.fenrir.settings.Settings
-import dev.ragnarok.fenrir.upload.Upload
 import dev.ragnarok.fenrir.util.InputTextDialog
 import dev.ragnarok.fenrir.util.UserInfoResolveUtil
 import dev.ragnarok.fenrir.util.Utils
@@ -64,7 +61,6 @@ import dev.ragnarok.fenrir.util.ViewUtils.getOnlineIcon
 import dev.ragnarok.fenrir.view.OnlineView
 import dev.ragnarok.fenrir.view.ProfileCoverDrawable
 import dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
-import me.minetsh.imaging.IMGEditActivity
 import java.io.File
 
 class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IUserWallView {
@@ -102,32 +98,6 @@ class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IU
                 }
             }
         }
-    private val openRequestPhoto =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-            if (result.data != null && result.resultCode == Activity.RESULT_OK) {
-                val localPhotos: ArrayList<LocalPhoto>? =
-                    result.data?.getParcelableArrayListExtraCompat(Extra.PHOTOS)
-                val file = result.data?.getStringExtra(Extra.PATH)
-                val video: LocalVideo? = result.data?.getParcelableExtraCompat(Extra.VIDEO)
-                lazyPresenter {
-                    firePhotosSelected(localPhotos, file, video)
-                }
-            }
-        }
-    private val openRequestResizePhoto =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                lazyPresenter {
-                    doUploadFile(
-                        (result.data
-                            ?: return@lazyPresenter).getStringExtra(IMGEditActivity.EXTRA_IMAGE_SAVE_PATH)
-                            ?: return@lazyPresenter,
-                        Upload.IMAGE_SIZE_FULL,
-                        false
-                    )
-                }
-            }
-        }
     private var mHeaderHolder: UserHeaderHolder? = null
 
     @SuppressLint("SetTextI18n")
@@ -365,36 +335,6 @@ class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IU
 
         SelectionUtils.addSelectionProfileSupport(getContext(), mHeaderHolder.avatarRoot, user);
     }*/
-    override fun showAvatarUploadedMessage(accountId: Long, post: Post) {
-        MaterialAlertDialogBuilder(requireActivity())
-            .setTitle(R.string.success)
-            .setMessage(R.string.avatar_was_changed_successfully)
-            .setPositiveButton(R.string.button_show) { _: DialogInterface?, _: Int ->
-                getPostPreviewPlace(
-                    accountId,
-                    post.vkid,
-                    post.ownerId,
-                    post
-                ).tryOpenWith(requireActivity())
-            }
-            .setNegativeButton(R.string.button_ok, null)
-            .show()
-    }
-
-    override fun doEditPhoto(uri: Uri) {
-        try {
-            openRequestResizePhoto.launch(
-                Intent(requireContext(), IMGEditActivity::class.java)
-                    .putExtra(IMGEditActivity.EXTRA_IMAGE_URI, uri)
-                    .putExtra(
-                        IMGEditActivity.EXTRA_IMAGE_SAVE_PATH,
-                        File(requireActivity().externalCacheDir.toString() + File.separator + "scale.jpg").absolutePath
-                    )
-            )
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-    }
 
     override fun showRegistrationDate(date: String) {
         MaterialAlertDialogBuilder(requireActivity())
@@ -417,7 +357,8 @@ class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IU
         products: Int,
         gifts: Int,
         products_services: Int,
-        narratives: Int
+        narratives: Int,
+        clips: Int
     ) {
         if (mHeaderHolder != null) {
             if (Settings.get().other().isShow_mutual_count) {
@@ -432,6 +373,7 @@ class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IU
             setupCounter(mHeaderHolder?.bArticles, articles)
             setupCounter(mHeaderHolder?.bGifts, gifts)
             setupCounter(mHeaderHolder?.bNarratives, narratives)
+            setupCounter(mHeaderHolder?.bClips, clips)
         }
     }
 
@@ -602,13 +544,8 @@ class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IU
                 }
 
                 3 -> {
-                    val sources = Sources()
-                        .with(LocalPhotosSelectableSource())
-                        .with(LocalGallerySelectableSource())
-                        .with(LocalVideosSelectableSource())
-                        .with(FileManagerSelectableSource())
-                    val intent = createIntent(requireActivity(), 1, sources)
-                    openRequestPhoto.launch(intent)
+                    presenter?.updateToStory(null)
+                    requestUploadStory()
                 }
             }
         }.setCancelable(true).show()
@@ -722,6 +659,7 @@ class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IU
         val bAudios: TextView = root.findViewById(R.id.fragment_user_profile_baudios)
         val bArticles: TextView = root.findViewById(R.id.fragment_user_profile_barticles)
         val bNarratives: TextView = root.findViewById(R.id.fragment_user_profile_bnarratives)
+        val bClips: TextView = root.findViewById(R.id.fragment_user_profile_bclips)
         val bGifts: TextView = root.findViewById(R.id.fragment_user_profile_bgifts)
         val fabMessage: FloatingActionButton =
             root.findViewById(R.id.header_user_profile_fab_message)
@@ -795,6 +733,12 @@ class UserWallFragment : AbsWallFragment<IUserWallView, UserWallPresenter>(), IU
                 .setOnClickListener {
                     presenter?.fireNarrativesClick()
                 }
+            root.findViewById<View>(R.id.header_user_profile_clips_container).let {
+                it.setOnClickListener {
+                    presenter?.fireClipsClick()
+                }
+                it.visibility = if (Utils.isOfficialVKCurrent) View.VISIBLE else View.GONE
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallPresenter.kt
index 7db16dc02..085f915e4 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/userwall/UserWallPresenter.kt
@@ -3,12 +3,10 @@ package dev.ragnarok.fenrir.fragment.userwall
 import android.annotation.SuppressLint
 import android.content.Context
 import android.content.DialogInterface
-import android.net.Uri
 import android.os.Bundle
 import androidx.annotation.StringRes
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dev.ragnarok.fenrir.*
-import dev.ragnarok.fenrir.Includes.provideMainThreadScheduler
 import dev.ragnarok.fenrir.api.HttpLoggerAndParser.toRequestBuilder
 import dev.ragnarok.fenrir.api.HttpLoggerAndParser.vkHeader
 import dev.ragnarok.fenrir.api.ProxyUtil
@@ -25,15 +23,12 @@ import dev.ragnarok.fenrir.model.criteria.WallCriteria
 import dev.ragnarok.fenrir.place.PlaceFactory.getMentionsPlace
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.upload.*
-import dev.ragnarok.fenrir.util.Pair
 import dev.ragnarok.fenrir.util.ShortcutUtils.createWallShortcutRx
 import dev.ragnarok.fenrir.util.Utils
 import dev.ragnarok.fenrir.util.Utils.getCauseIfRuntime
 import dev.ragnarok.fenrir.util.Utils.singletonArrayList
-import dev.ragnarok.fenrir.util.rxutils.RxUtils.ignore
 import io.reactivex.rxjava3.core.Single
 import okhttp3.*
-import java.io.File
 import java.text.DateFormat
 import java.text.ParseException
 import java.text.SimpleDateFormat
@@ -49,13 +44,14 @@ class UserWallPresenter(
 ) : AbsWallPresenter<IUserWallView>(accountId, ownerId, savedInstanceState) {
     private val filters: MutableList<PostFilter>
     private val ownersRepository: IOwnersRepository = owners
+    private val storiesInteractor: IStoriesShortVideosInteractor =
+        InteractorFactory.createStoriesInteractor()
     private val relationshipInteractor: IRelationshipInteractor =
         InteractorFactory.createRelationshipInteractor()
     private val accountInteractor: IAccountsInteractor = InteractorFactory.createAccountInteractor()
     private val photosInteractor: IPhotosInteractor = InteractorFactory.createPhotosInteractor()
     private val faveInteractor: IFaveInteractor = InteractorFactory.createFaveInteractor()
     private val wallsRepository: IWallsRepository = walls
-    private val uploadManager: IUploadManager = Includes.uploadManager
     var user: User
         private set
     private var details: UserDetails
@@ -64,127 +60,6 @@ class UserWallPresenter(
         requestActualFullInfo()
     }
 
-    fun firePhotosSelected(localPhotos: ArrayList<LocalPhoto>?, file: String?, video: LocalVideo?) {
-        when {
-            file.nonNullNoEmpty() -> doUploadFile(file)
-            localPhotos.nonNullNoEmpty() -> {
-                doUploadPhotos(localPhotos)
-            }
-
-            video != null -> {
-                doUploadVideo(video.getData().toString())
-            }
-        }
-    }
-
-    private fun doUploadFile(file: String) {
-        for (i in Settings.get().other().photoExt()) {
-            if (file.endsWith(i, true)) {
-                Uri.fromFile(
-                    File(
-                        file
-                    )
-                )
-                return
-            }
-        }
-        for (i in Settings.get().other().videoExt()) {
-            if (file.endsWith(i, true)) {
-                doUploadFile(
-                    file,
-                    0,
-                    true
-                )
-                return
-            }
-        }
-        MaterialAlertDialogBuilder(context)
-            .setTitle(R.string.select)
-            .setNegativeButton(R.string.video) { _: DialogInterface?, _: Int ->
-                doUploadFile(
-                    file,
-                    0,
-                    true
-                )
-            }
-            .setPositiveButton(R.string.photo) { _: DialogInterface?, _: Int ->
-                view?.doEditPhoto(
-                    Uri.fromFile(
-                        File(
-                            file
-                        )
-                    )
-                )
-            }
-            .create().show()
-    }
-
-    fun doUploadFile(file: String, size: Int, isVideo: Boolean) {
-        val intents: List<UploadIntent> = if (isVideo) {
-            UploadUtils.createIntents(
-                accountId,
-                UploadDestination.forStory(MessageMethod.VIDEO),
-                file,
-                size,
-                true
-            )
-        } else {
-            UploadUtils.createIntents(
-                accountId,
-                UploadDestination.forStory(MessageMethod.PHOTO),
-                file,
-                size,
-                true
-            )
-        }
-        uploadManager.enqueue(intents)
-    }
-
-    private fun doUploadVideo(file: String) {
-        val intents = UploadUtils.createVideoIntents(
-            accountId,
-            UploadDestination.forStory(MessageMethod.VIDEO),
-            file,
-            true
-        )
-        uploadManager.enqueue(intents)
-    }
-
-    private fun doUploadPhotos(photos: List<LocalPhoto>) {
-        if (photos.size == 1) {
-            var to_up = photos[0].getFullImageUri() ?: return
-            if (to_up.path?.let { File(it).isFile } == true) {
-                to_up = Uri.fromFile(to_up.path?.let { File(it) })
-            }
-            view?.doEditPhoto(to_up)
-            return
-        }
-        val intents = UploadUtils.createIntents(
-            accountId,
-            UploadDestination.forStory(MessageMethod.PHOTO),
-            photos,
-            Upload.IMAGE_SIZE_FULL,
-            true
-        )
-        uploadManager.enqueue(intents)
-    }
-
-    private fun onUploadFinished(pair: Pair<Upload, UploadResult<*>>) {
-        val destination = pair.first.destination
-        if (destination.method == Method.PHOTO_TO_PROFILE && destination.ownerId == ownerId) {
-            requestActualFullInfo()
-            val post = pair.second.result as Post
-            resumedView?.showAvatarUploadedMessage(
-                accountId,
-                post
-            )
-        } else if (destination.method == Method.STORY && Settings.get()
-                .accounts().current == ownerId
-        ) {
-            fireRefresh()
-        }
-    }
-
     private fun resolveCoverImage() {
         details.getCover()?.getImages().ifNonNullNoEmpty({
             var def = 0
@@ -214,7 +89,8 @@ class UserWallPresenter(
             details.getProductsCount(),
             details.getGiftCount(),
             details.getProductServicesCount(),
-            details.getNarrativesCount()
+            details.getNarrativesCount(),
+            details.getClipsCount()
         )
     }
 
@@ -853,14 +729,6 @@ class UserWallPresenter(
         )
     }
 
-    fun fireNewAvatarPhotoSelected(file: String?) {
-        val intent = UploadIntent(accountId, UploadDestination.forProfilePhoto(ownerId))
-            .setAutoCommit(true)
-            .setFileUri(Uri.parse(file))
-            .setSize(Upload.IMAGE_SIZE_FULL)
-        uploadManager.enqueue(listOf(intent))
-    }
-
     override fun fireAddToShortcutClick() {
         appendDisposable(
             createWallShortcutRx(
@@ -881,7 +749,7 @@ class UserWallPresenter(
     }
 
     override fun searchStory(ByName: Boolean) {
-        appendDisposable(ownersRepository.searchStory(
+        appendDisposable(storiesInteractor.searchStory(
             accountId,
             if (ByName) user.fullName else null,
             if (ByName) null else ownerId
@@ -910,13 +778,5 @@ class UserWallPresenter(
         syncFiltersWithSelectedMode()
         syncFilterCountersWithDetails()
         refreshUserDetails()
-        appendDisposable(
-            uploadManager.observeResults()
-                .observeOn(provideMainThreadScheduler())
-                .subscribe(
-                    { pair: Pair<Upload, UploadResult<*>> -> onUploadFinished(pair) },
-                    ignore()
-                )
-        )
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/videos/VideosListPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/videos/VideosListPresenter.kt
index eb8b70a98..9c0a99090 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/videos/VideosListPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/videos/VideosListPresenter.kt
@@ -490,7 +490,7 @@ class VideosListPresenter(
             }
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadResults(it) })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadStatusUpdate(it) })
         appendDisposable(uploadManager.observeProgress()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/vkphotos/VKPhotosPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/vkphotos/VKPhotosPresenter.kt
index 2880c6c94..d351793a0 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/vkphotos/VKPhotosPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/vkphotos/VKPhotosPresenter.kt
@@ -594,7 +594,7 @@ class VKPhotosPresenter(
         appendDisposable(uploadManager.observeResults()
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadResults(it) })
-        appendDisposable(uploadManager.obseveStatus()
+        appendDisposable(uploadManager.observeStatus()
             .observeOn(provideMainThreadScheduler())
             .subscribe { onUploadStatusUpdate(it) })
         appendDisposable(uploadManager.observeProgress()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/walllinksattachments/LinksAdapter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/walllinksattachments/LinksAdapter.kt
index e8c23d95a..594a13884 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/walllinksattachments/LinksAdapter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/walllinksattachments/LinksAdapter.kt
@@ -11,7 +11,6 @@ import dev.ragnarok.fenrir.model.Link
 import dev.ragnarok.fenrir.picasso.PicassoInstance.Companion.with
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.util.ViewUtils.displayAvatar
-import java.util.EventListener
 
 class LinksAdapter(data: MutableList<Link>) :
     RecyclerBindableAdapter<Link, LinksAdapter.LinkViewHolder>(data) {
@@ -76,7 +75,7 @@ class LinksAdapter(data: MutableList<Link>) :
         return R.layout.item_document_list
     }
 
-    interface ActionListener : EventListener {
+    interface ActionListener {
         fun onLinkClick(index: Int, doc: Link)
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/wallpostqueryattachments/WallPostQueryAttachmentsPresenter.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/wallpostqueryattachments/WallPostQueryAttachmentsPresenter.kt
index 8c0196877..8dc936664 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/wallpostqueryattachments/WallPostQueryAttachmentsPresenter.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/fragment/wallattachments/wallpostqueryattachments/WallPostQueryAttachmentsPresenter.kt
@@ -15,7 +15,7 @@ import dev.ragnarok.fenrir.util.Utils.safeCountOf
 import dev.ragnarok.fenrir.util.rxutils.RxUtils.dummy
 import dev.ragnarok.fenrir.util.rxutils.RxUtils.ignore
 import io.reactivex.rxjava3.disposables.CompositeDisposable
-import java.util.*
+import java.util.Locale
 
 class WallPostQueryAttachmentsPresenter(
     accountId: Long,
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/LinkParser.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/LinkParser.kt
index 5622ed9f9..0468552e5 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/LinkParser.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/LinkParser.kt
@@ -3,7 +3,6 @@ package dev.ragnarok.fenrir.link
 import android.content.Context
 import android.text.SpannableStringBuilder
 import android.util.Patterns
-import java.util.*
 import java.util.regex.Pattern
 
 object LinkParser {
@@ -41,7 +40,7 @@ object LinkParser {
                 matcher.start() - i2 + (matcher.group(14)?.length ?: 0),
                 0
             )
-            i2 += matcher.group().length - Objects.requireNonNull(matcher.group(14)).length
+            i2 += matcher.group().length - (matcher.group(14)?.length ?: 0)
             spannableStringBuilder3 = replace
         }
         r12 = spannableStringBuilder3
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/VKLinkParser.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/VKLinkParser.kt
index f2e0da8ab..2b22d887b 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/VKLinkParser.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/link/VKLinkParser.kt
@@ -7,7 +7,7 @@ import dev.ragnarok.fenrir.util.Optional
 import dev.ragnarok.fenrir.util.Optional.Companion.empty
 import dev.ragnarok.fenrir.util.Optional.Companion.wrap
 import java.net.URLDecoder
-import java.util.*
+import java.util.LinkedList
 import java.util.regex.Pattern
 import kotlin.math.abs
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackController.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackController.kt
index a146fbdbc..eb3bbad24 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackController.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackController.kt
@@ -11,7 +11,7 @@ import dev.ragnarok.fenrir.util.Logger
 import dev.ragnarok.fenrir.util.existfile.AbsFileExist
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.subjects.PublishSubject
-import java.util.*
+import java.util.WeakHashMap
 
 object MusicPlaybackController {
     private val mConnectionMap: WeakHashMap<Context, ServiceBinder> = WeakHashMap()
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackService.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackService.kt
index a7ec9581b..98945a6b8 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackService.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/media/music/MusicPlaybackService.kt
@@ -236,7 +236,7 @@ class MusicPlaybackService : Service() {
         audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, audioSessionId)
         audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, packageName)
         sendBroadcast(audioEffectsIntent)
-        mAlarmManager?.cancel(mShutdownIntent)
+        mShutdownIntent?.let { mAlarmManager?.cancel(it) }
         mPlayer?.release()
         mMediaSession?.release()
         mNotificationHelper?.killNotification()
@@ -348,10 +348,12 @@ class MusicPlaybackService : Service() {
 
     private fun scheduleDelayedShutdown() {
         if (Constants.IS_DEBUG) Log.v(TAG, "Scheduling shutdown in $IDLE_DELAY ms")
-        mAlarmManager?.set(
-            AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + IDLE_DELAY,
-            mShutdownIntent
-        )
+        mShutdownIntent?.let {
+            mAlarmManager?.set(
+                AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + IDLE_DELAY,
+                it
+            )
+        }
         mShutdownScheduled = true
     }
 
@@ -361,7 +363,7 @@ class MusicPlaybackService : Service() {
             "Cancelling delayed shutdown, scheduled = $mShutdownScheduled"
         )
         if (mShutdownScheduled) {
-            mAlarmManager?.cancel(mShutdownIntent)
+            mShutdownIntent?.let { mAlarmManager?.cancel(it) }
             mShutdownScheduled = false
         }
     }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/AttachmentEntry.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/AttachmentEntry.kt
index 3f63f3ebf..a6d238cfa 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/AttachmentEntry.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/AttachmentEntry.kt
@@ -6,8 +6,8 @@ import dev.ragnarok.fenrir.getBoolean
 import dev.ragnarok.fenrir.putBoolean
 import dev.ragnarok.fenrir.readTypedObjectCompat
 import dev.ragnarok.fenrir.writeTypedObjectCompat
-import java.util.Random
 import java.util.concurrent.atomic.AtomicInteger
+import kotlin.random.Random
 
 class AttachmentEntry : Parcelable {
     val id: Int
@@ -66,7 +66,7 @@ class AttachmentEntry : Parcelable {
     }
 
     companion object {
-        private val ID_GEN = AtomicInteger(Random().nextInt(5000))
+        private val ID_GEN = AtomicInteger(Random(System.nanoTime()).nextInt(5000))
 
         @JvmField
         val CREATOR: Parcelable.Creator<AttachmentEntry> =
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/CommunityDetails.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/CommunityDetails.kt
index f72651c34..5f6a87020 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/CommunityDetails.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/CommunityDetails.kt
@@ -26,6 +26,7 @@ class CommunityDetails : Parcelable {
     private var chatsCount = 0
     private var productServicesCount = 0
     private var narrativesCount = 0
+    private var clipsCount = 0
     private var status: String? = null
     private var statusAudio: Audio? = null
     private var cover: Cover? = null
@@ -52,6 +53,7 @@ class CommunityDetails : Parcelable {
         chatsCount = parcel.readInt()
         productServicesCount = parcel.readInt()
         narrativesCount = parcel.readInt()
+        clipsCount = parcel.readInt()
         status = parcel.readString()
         statusAudio = parcel.readTypedObjectCompat(Audio.CREATOR)
         cover = parcel.readTypedObjectCompat(Cover.CREATOR)
@@ -64,26 +66,31 @@ class CommunityDetails : Parcelable {
         return this
     }
 
-    fun setMenu(menu: List<Menu>?): CommunityDetails {
-        this.menu = menu
+    fun getProductServicesCount(): Int {
+        return productServicesCount
+    }
+
+    fun setClipsCount(clipsCount: Int): CommunityDetails {
+        this.clipsCount = clipsCount
         return this
     }
 
+    fun getClipsCount(): Int {
+        return clipsCount
+    }
+
     fun setNarrativesCount(narrativesCount: Int): CommunityDetails {
         this.narrativesCount = narrativesCount
         return this
     }
 
-    fun getProductServicesCount(): Int {
-        return productServicesCount
-    }
-
     fun getNarrativesCount(): Int {
         return narrativesCount
     }
 
-    fun getCover(): Cover? {
-        return cover
+    fun setMenu(menu: List<Menu>?): CommunityDetails {
+        this.menu = menu
+        return this
     }
 
     fun getMenu(): List<Menu>? {
@@ -95,6 +102,10 @@ class CommunityDetails : Parcelable {
         return this
     }
 
+    fun getCover(): Cover? {
+        return cover
+    }
+
     fun getChatsCount(): Int {
         return chatsCount
     }
@@ -411,6 +422,7 @@ class CommunityDetails : Parcelable {
         parcel.writeInt(chatsCount)
         parcel.writeInt(productServicesCount)
         parcel.writeInt(narrativesCount)
+        parcel.writeInt(clipsCount)
         parcel.writeString(status)
         parcel.writeTypedObjectCompat(statusAudio, flags)
         parcel.writeTypedObjectCompat(cover, flags)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/EditedMessage.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/EditedMessage.kt
index 09a44cd13..e4e35f185 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/EditedMessage.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/EditedMessage.kt
@@ -25,11 +25,11 @@ class EditedMessage(val message: Message) {
         get() {
             if (body.isNullOrBlank()) {
                 for (entry in attachments) {
-                    if (entry.attachment is Upload) continue
-
+                    if (entry.attachment is Upload) {
+                        continue
+                    }
                     return true
                 }
-
                 return false
             } else {
                 return true
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/LocalVideo.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/LocalVideo.kt
index 684242bc9..7645d6391 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/LocalVideo.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/LocalVideo.kt
@@ -37,14 +37,14 @@ class LocalVideo : Parcelable, Comparable<LocalVideo>, ISelectable {
     override fun writeToParcel(dest: Parcel, flags: Int) {
         dest.writeLong(id)
         if (data == null) {
-            dest.writeString(null)
+            dest.writeString("null")
         } else {
             dest.writeString(data.toString())
         }
         dest.putBoolean(selected)
         dest.writeInt(index)
         dest.writeLong(size)
-        dest.writeLong(duration.toLong())
+        dest.writeInt(duration)
         dest.writeString(title)
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Privacy.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Privacy.kt
index 4206604fa..bdb7eb0ac 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Privacy.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Privacy.kt
@@ -5,7 +5,7 @@ import android.os.Parcel
 import android.os.Parcelable
 import dev.ragnarok.fenrir.R
 import dev.ragnarok.fenrir.util.Utils.join
-import java.util.*
+import java.util.Collections
 
 class Privacy : Parcelable, Cloneable {
     var type: String
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/UserDetails.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/UserDetails.kt
index 28480e7b8..a9ca988c8 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/UserDetails.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/UserDetails.kt
@@ -29,6 +29,7 @@ class UserDetails : Parcelable {
     private var giftCount = 0
     private var productServicesCount = 0
     private var narrativesCount = 0
+    private var clipsCount = 0
     private var city: City? = null
     private var country: Country? = null
     private var hometown: String? = null
@@ -88,6 +89,7 @@ class UserDetails : Parcelable {
         giftCount = parcel.readInt()
         productServicesCount = parcel.readInt()
         narrativesCount = parcel.readInt()
+        clipsCount = parcel.readInt()
         city = parcel.readTypedObjectCompat(City.CREATOR)
         country = parcel.readTypedObjectCompat(Country.CREATOR)
         hometown = parcel.readString()
@@ -127,19 +129,28 @@ class UserDetails : Parcelable {
         return this
     }
 
+    fun getProductServicesCount(): Int {
+        return productServicesCount
+    }
+
     fun setNarrativesCount(narrativesCount: Int): UserDetails {
         this.narrativesCount = narrativesCount
         return this
     }
 
-    fun getProductServicesCount(): Int {
-        return productServicesCount
-    }
-
     fun getNarrativesCount(): Int {
         return narrativesCount
     }
 
+    fun setClipsCount(clipsCount: Int): UserDetails {
+        this.clipsCount = clipsCount
+        return this
+    }
+
+    fun getClipsCount(): Int {
+        return clipsCount
+    }
+
     fun getInterests(): String? {
         return interests
     }
@@ -794,6 +805,7 @@ class UserDetails : Parcelable {
         parcel.writeInt(giftCount)
         parcel.writeInt(productServicesCount)
         parcel.writeInt(narrativesCount)
+        parcel.writeInt(clipsCount)
         parcel.writeTypedObjectCompat(city, flags)
         parcel.writeTypedObjectCompat(country, flags)
         parcel.writeString(hometown)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Video.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Video.kt
index 8b9b39ffb..b4f196d36 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Video.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/Video.kt
@@ -85,6 +85,8 @@ class Video : AbsModel, ParcelNative.ParcelableNative {
         private set
     var msgPeerId = 0L
         private set
+    var optionalOwner: Owner? = null
+        private set
 
     constructor()
     internal constructor(parcel: Parcel) {
@@ -126,6 +128,7 @@ class Video : AbsModel, ParcelNative.ParcelableNative {
         isFavorite = parcel.getBoolean()
         msgId = parcel.readInt()
         msgPeerId = parcel.readLong()
+        optionalOwner = ParcelableOwnerWrapper.readOwner(parcel)
     }
 
     internal constructor(parcel: ParcelNative) {
@@ -167,6 +170,7 @@ class Video : AbsModel, ParcelNative.ParcelableNative {
         isFavorite = parcel.readBoolean()
         msgId = parcel.readInt()
         msgPeerId = parcel.readLong()
+        optionalOwner = ParcelableOwnerWrapper.readOwner(parcel)
     }
 
     @AbsModelType
@@ -223,6 +227,7 @@ class Video : AbsModel, ParcelNative.ParcelableNative {
         parcel.putBoolean(isFavorite)
         parcel.writeInt(msgId)
         parcel.writeLong(msgPeerId)
+        ParcelableOwnerWrapper.writeOwner(parcel, flags, optionalOwner)
     }
 
     override fun writeToParcelNative(dest: ParcelNative) {
@@ -264,6 +269,7 @@ class Video : AbsModel, ParcelNative.ParcelableNative {
         dest.writeBoolean(isFavorite)
         dest.writeInt(msgId)
         dest.writeLong(msgPeerId)
+        ParcelableOwnerWrapper.writeOwner(dest, optionalOwner)
     }
 
     fun setCanAdd(canAdd: Boolean): Video {
@@ -450,6 +456,11 @@ class Video : AbsModel, ParcelNative.ParcelableNative {
         return this
     }
 
+    fun setOptionalOwner(optionalOwner: Owner?): Video {
+        this.optionalOwner = optionalOwner
+        return this
+    }
+
     companion object {
         @JvmField
         val CREATOR: Parcelable.Creator<Video> = object : Parcelable.Creator<Video> {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/catalog_v2_audio/CatalogV2ArtistItem.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/catalog_v2_audio/CatalogV2ArtistItem.kt
index 19eee47fa..fac9b5299 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/catalog_v2_audio/CatalogV2ArtistItem.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/model/catalog_v2_audio/CatalogV2ArtistItem.kt
@@ -7,6 +7,7 @@ import dev.ragnarok.fenrir.api.model.catalog_v2_audio.VKApiCatalogV2ArtistItem
 import dev.ragnarok.fenrir.getBoolean
 import dev.ragnarok.fenrir.model.AbsModel
 import dev.ragnarok.fenrir.model.AbsModelType
+import dev.ragnarok.fenrir.nonNullNoEmpty
 import dev.ragnarok.fenrir.putBoolean
 import kotlin.math.abs
 
@@ -40,7 +41,7 @@ class CatalogV2ArtistItem : AbsModel {
                 imgUrl = i.url
             }
         }
-        imgUrl ?: run {
+        if (imgUrl.isNullOrEmpty() && photo.nonNullNoEmpty()) {
             imgUrl = photo?.last()?.url
         }
         return imgUrl
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/Place.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/Place.kt
index 8512e5382..bb567a1e0 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/Place.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/Place.kt
@@ -227,6 +227,8 @@ open class Place : Parcelable {
         const val CATALOG_V2_AUDIO_CATALOG = 96
         const val CATALOG_V2_AUDIO_SECTION = 97
         const val CATALOG_V2_LIST_EDIT = 98
+        const val STORIES_VIEWS = 99
+        const val SHORT_VIDEOS = 100
 
         @JvmField
         val CREATOR: Parcelable.Creator<Place> = object : Parcelable.Creator<Place> {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/PlaceFactory.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/PlaceFactory.kt
index 3f61bd296..0a67c4479 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/PlaceFactory.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/place/PlaceFactory.kt
@@ -8,6 +8,7 @@ import dev.ragnarok.fenrir.activity.gifpager.GifPagerActivity
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.buildArgsForAlbum
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.buildArgsForFave
 import dev.ragnarok.fenrir.activity.photopager.PhotoPagerActivity.Companion.buildArgsForSimpleGallery
+import dev.ragnarok.fenrir.activity.shortvideopager.ShortVideoPagerActivity
 import dev.ragnarok.fenrir.activity.storypager.StoryPagerActivity
 import dev.ragnarok.fenrir.dialog.ResolveDomainDialog
 import dev.ragnarok.fenrir.fragment.BrowserFragment
@@ -36,6 +37,7 @@ import dev.ragnarok.fenrir.fragment.friends.friendsbyphones.FriendsByPhonesFragm
 import dev.ragnarok.fenrir.fragment.friends.friendstabs.FriendsTabsFragment
 import dev.ragnarok.fenrir.fragment.groupchats.GroupChatsFragment
 import dev.ragnarok.fenrir.fragment.likes.LikesFragment
+import dev.ragnarok.fenrir.fragment.likes.storiesview.StoriesViewFragment
 import dev.ragnarok.fenrir.fragment.marketview.MarketViewFragment
 import dev.ragnarok.fenrir.fragment.messages.chatmembers.ChatMembersFragment
 import dev.ragnarok.fenrir.fragment.messages.fwds.FwdsFragment
@@ -691,6 +693,11 @@ object PlaceFactory {
             .setArguments(StoryPagerActivity.buildArgs(accountId, stories, index))
     }
 
+    fun getShortVideoPlace(accountId: Long, ownerId: Long?): Place {
+        return Place(Place.SHORT_VIDEOS)
+            .setArguments(ShortVideoPagerActivity.buildArgs(accountId, ownerId))
+    }
+
     fun getVideoPreviewPlace(
         accountId: Long,
         ownerId: Long,
@@ -726,6 +733,15 @@ object PlaceFactory {
             .setArguments(LikesFragment.buildArgs(accountId, type, ownerId, itemId, filter))
     }
 
+    fun getStoriesViewPlace(
+        accountId: Long,
+        ownerId: Long,
+        storyId: Int
+    ): Place {
+        return Place(Place.STORIES_VIEWS)
+            .setArguments(StoriesViewFragment.buildArgs(accountId, ownerId, storyId))
+    }
+
     fun getCommunitiesPlace(accountId: Long, userId: Long): Place {
         return Place(Place.COMMUNITIES)
             .withLongExtra(Extra.ACCOUNT_ID, accountId)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/realtime/RealtimeMessagesProcessor.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/realtime/RealtimeMessagesProcessor.kt
index 4004aa509..4f1001691 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/realtime/RealtimeMessagesProcessor.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/realtime/RealtimeMessagesProcessor.kt
@@ -30,7 +30,7 @@ import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.core.SingleTransformer
 import io.reactivex.rxjava3.subjects.PublishSubject
-import java.util.*
+import java.util.LinkedList
 import java.util.concurrent.atomic.AtomicInteger
 
 internal class RealtimeMessagesProcessor : IRealtimeMessagesProcessor {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/ChatDownloadWorker.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/ChatDownloadWorker.kt
index 2ecc4ff2f..c9829da18 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/ChatDownloadWorker.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/ChatDownloadWorker.kt
@@ -44,7 +44,7 @@ import java.io.OutputStream
 import java.io.OutputStreamWriter
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
 import kotlin.math.abs
 
 class ChatDownloadWorker(context: Context, workerParams: WorkerParameters) :
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/FaveSyncWorker.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/FaveSyncWorker.kt
index f84770703..3c264d6ee 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/FaveSyncWorker.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/service/FaveSyncWorker.kt
@@ -31,7 +31,6 @@ import dev.ragnarok.fenrir.util.Utils.hasOreo
 import dev.ragnarok.fenrir.util.toast.CustomToast
 import java.io.File
 import java.io.FileOutputStream
-import java.util.*
 import java.util.regex.Pattern
 import kotlin.math.abs
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt
index 691727233..d2aee6963 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/AccountsSettings.kt
@@ -14,7 +14,7 @@ import dev.ragnarok.fenrir.util.rxutils.RxUtils.dummy
 import dev.ragnarok.fenrir.util.rxutils.RxUtils.ignore
 import io.reactivex.rxjava3.core.Flowable
 import io.reactivex.rxjava3.processors.PublishProcessor
-import java.util.*
+import java.util.Collections
 
 internal class AccountsSettings @SuppressLint("UseSparseArrays") constructor(context: Context) :
     IAccountsSettings {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt
index ef9f34ba2..43583abc8 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/settings/OtherSettings.kt
@@ -21,7 +21,7 @@ import dev.ragnarok.fenrir.util.Utils
 import kotlinx.serialization.builtins.ListSerializer
 import kotlinx.serialization.builtins.serializer
 import java.io.File
-import java.util.*
+import java.util.Collections
 
 internal class OtherSettings(context: Context) : IOtherSettings {
     private val app: Context = context.applicationContext
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/IUploadManager.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/IUploadManager.kt
index 2c43c3e8e..31ae7c40f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/IUploadManager.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/IUploadManager.kt
@@ -7,13 +7,14 @@ import io.reactivex.rxjava3.core.Single
 
 interface IUploadManager {
     operator fun get(accountId: Long, destination: UploadDestination): Single<List<Upload>>
+    operator fun get(accountId: Long, @Method filters: List<Int>): Single<List<Upload>>
     fun enqueue(intents: List<UploadIntent>)
     fun cancel(id: Int)
     fun cancelAll(accountId: Long, destination: UploadDestination)
     fun getCurrent(): Optional<Upload>
     fun observeDeleting(includeCompleted: Boolean): Flowable<IntArray>
     fun observeAdding(): Flowable<List<Upload>>
-    fun obseveStatus(): Flowable<Upload>
+    fun observeStatus(): Flowable<Upload>
     fun observeResults(): Flowable<Pair<Upload, UploadResult<*>>>
     fun observeProgress(): Flowable<List<IProgressUpdate>>
     interface IProgressUpdate {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/Upload.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/Upload.kt
index d5bb68f85..703410f6e 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/Upload.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/Upload.kt
@@ -12,8 +12,8 @@ import dev.ragnarok.fenrir.readTypedObjectCompat
 import dev.ragnarok.fenrir.util.ParcelUtils.readObjectLong
 import dev.ragnarok.fenrir.util.ParcelUtils.writeObjectLong
 import dev.ragnarok.fenrir.writeTypedObjectCompat
-import java.util.Random
 import java.util.concurrent.atomic.AtomicInteger
+import kotlin.random.Random
 
 open class Upload : AbsModel, Identificable {
     val accountId: Long
@@ -180,6 +180,6 @@ open class Upload : AbsModel, Identificable {
                 return arrayOfNulls(size)
             }
         }
-        val IDGEN = AtomicInteger(Random().nextInt(5000))
+        val IDGEN = AtomicInteger(Random(System.nanoTime()).nextInt(5000))
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadDestination.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadDestination.kt
index 309ea728b..ad440044f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadDestination.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadDestination.kt
@@ -6,6 +6,7 @@ import android.os.Parcelable
 open class UploadDestination : Parcelable {
     val id: Int
     val ownerId: Long
+    val ref: String?
 
     @Method
     val method: Int
@@ -13,11 +14,12 @@ open class UploadDestination : Parcelable {
     @MessageMethod
     var messageMethod: Int
 
-    constructor(id: Int, ownerId: Long, method: Int, message_method: Int) {
+    constructor(id: Int, ownerId: Long, method: Int, messageMethod: Int, ref: String?) {
         this.id = id
         this.ownerId = ownerId
         this.method = method
-        messageMethod = message_method
+        this.messageMethod = messageMethod
+        this.ref = ref
     }
 
     internal constructor(parcel: Parcel) {
@@ -25,6 +27,7 @@ open class UploadDestination : Parcelable {
         ownerId = parcel.readLong()
         method = parcel.readInt()
         messageMethod = parcel.readInt()
+        ref = parcel.readString()
     }
 
     override fun describeContents(): Int {
@@ -36,6 +39,7 @@ open class UploadDestination : Parcelable {
         dest.writeLong(ownerId)
         dest.writeInt(method)
         dest.writeInt(messageMethod)
+        dest.writeString(ref)
     }
 
     override fun equals(other: Any?): Boolean {
@@ -67,6 +71,7 @@ open class UploadDestination : Parcelable {
                 ", ownerId=" + ownerId +
                 ", method=" + method +
                 ", message_method=" + messageMethod +
+                ", ref=" + ref.orEmpty() +
                 '}'
     }
 
@@ -93,7 +98,8 @@ open class UploadDestination : Parcelable {
                 NO_ID,
                 ownerId,
                 Method.PHOTO_TO_PROFILE,
-                MessageMethod.NULL
+                MessageMethod.NULL,
+                null
             )
         }
 
@@ -103,7 +109,8 @@ open class UploadDestination : Parcelable {
                 NO_ID,
                 chat_id,
                 Method.PHOTO_TO_CHAT,
-                MessageMethod.NULL
+                MessageMethod.NULL,
+                null
             )
         }
 
@@ -113,7 +120,8 @@ open class UploadDestination : Parcelable {
                 NO_ID,
                 ownerId,
                 Method.DOCUMENT,
-                MessageMethod.NULL
+                MessageMethod.NULL,
+                null
             )
         }
 
@@ -123,7 +131,8 @@ open class UploadDestination : Parcelable {
                 NO_ID,
                 ownerId,
                 Method.AUDIO,
-                MessageMethod.NULL
+                MessageMethod.NULL,
+                null
             )
         }
 
@@ -133,13 +142,14 @@ open class UploadDestination : Parcelable {
                 NO_ID,
                 NO_ID_L,
                 Method.REMOTE_PLAY_AUDIO,
-                MessageMethod.NULL
+                MessageMethod.NULL,
+                null
             )
         }
 
 
-        fun forStory(@MessageMethod msg_method: Int): UploadDestination {
-            return UploadDestination(NO_ID, NO_ID_L, Method.STORY, msg_method)
+        fun forStory(@MessageMethod msg_method: Int, ref: String?): UploadDestination {
+            return UploadDestination(NO_ID, NO_ID_L, Method.STORY, msg_method, ref)
         }
 
 
@@ -148,7 +158,8 @@ open class UploadDestination : Parcelable {
                 is_public,
                 ownerId,
                 Method.VIDEO,
-                MessageMethod.NULL
+                MessageMethod.NULL,
+                null
             )
         }
 
@@ -156,7 +167,8 @@ open class UploadDestination : Parcelable {
         fun forMessage(mdbid: Int): UploadDestination {
             return UploadDestination(
                 mdbid, WITHOUT_OWNER,
-                Method.TO_MESSAGE, MessageMethod.PHOTO
+                Method.TO_MESSAGE, MessageMethod.PHOTO,
+                null
             )
         }
 
@@ -164,7 +176,8 @@ open class UploadDestination : Parcelable {
         fun forMessage(mdbid: Int, @MessageMethod msg_method: Int): UploadDestination {
             return UploadDestination(
                 mdbid, WITHOUT_OWNER,
-                Method.TO_MESSAGE, msg_method
+                Method.TO_MESSAGE, msg_method,
+                null
             )
         }
 
@@ -174,13 +187,14 @@ open class UploadDestination : Parcelable {
                 albumId,
                 ownerId,
                 Method.PHOTO_TO_ALBUM,
-                MessageMethod.NULL
+                MessageMethod.NULL,
+                null
             )
         }
 
 
         fun forPost(dbid: Int, ownerId: Long, @MessageMethod msg_method: Int): UploadDestination {
-            return UploadDestination(dbid, ownerId, Method.TO_WALL, msg_method)
+            return UploadDestination(dbid, ownerId, Method.TO_WALL, msg_method, null)
         }
 
 
@@ -189,7 +203,8 @@ open class UploadDestination : Parcelable {
                 dbid,
                 ownerId,
                 Method.TO_WALL,
-                MessageMethod.PHOTO
+                MessageMethod.PHOTO,
+                null
             )
         }
 
@@ -199,17 +214,9 @@ open class UploadDestination : Parcelable {
                 dbid,
                 sourceOwnerId,
                 Method.TO_COMMENT,
-                MessageMethod.PHOTO
+                MessageMethod.PHOTO,
+                null
             )
         }
-
-
-        fun forComment(
-            dbid: Int,
-            sourceOwnerId: Long,
-            @MessageMethod msg_method: Int
-        ): UploadDestination {
-            return UploadDestination(dbid, sourceOwnerId, Method.TO_COMMENT, msg_method)
-        }
     }
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadManagerImpl.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadManagerImpl.kt
index ed1c93535..1cf928d15 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadManagerImpl.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/UploadManagerImpl.kt
@@ -39,7 +39,7 @@ import io.reactivex.rxjava3.disposables.CompositeDisposable
 import io.reactivex.rxjava3.processors.PublishProcessor
 import io.reactivex.rxjava3.schedulers.Schedulers
 import java.lang.ref.WeakReference
-import java.util.*
+import java.util.Collections
 import java.util.concurrent.Executors
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
@@ -74,6 +74,20 @@ class UploadManagerImpl(
         return Single.fromCallable { getByDestination(accountId, destination) }
     }
 
+    override fun get(accountId: Long, @Method filters: List<Int>): Single<List<Upload>> {
+        return Single.fromCallable {
+            synchronized(this) {
+                val data: MutableList<Upload> = ArrayList()
+                for (upload in queue) {
+                    if (accountId == upload.accountId && filters.contains(upload.destination.method)) {
+                        data.add(upload)
+                    }
+                }
+                return@fromCallable data
+            }
+        }
+    }
+
     private fun getByDestination(accountId: Long, destination: UploadDestination): List<Upload> {
         synchronized(this) {
             val data: MutableList<Upload> = ArrayList()
@@ -312,7 +326,7 @@ class UploadManagerImpl(
         return addingProcessor.onBackpressureBuffer()
     }
 
-    override fun obseveStatus(): Flowable<Upload> {
+    override fun observeStatus(): Flowable<Upload> {
         return statusProcessor.onBackpressureBuffer()
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/impl/StoryUploadable.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/impl/StoryUploadable.kt
index eea4b2609..e0f508bfe 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/impl/StoryUploadable.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/upload/impl/StoryUploadable.kt
@@ -9,6 +9,7 @@ import dev.ragnarok.fenrir.domain.Repository.owners
 import dev.ragnarok.fenrir.domain.mappers.Dto2Model
 import dev.ragnarok.fenrir.exception.NotFoundException
 import dev.ragnarok.fenrir.model.Story
+import dev.ragnarok.fenrir.nonNullNoEmpty
 import dev.ragnarok.fenrir.settings.Settings
 import dev.ragnarok.fenrir.upload.IUploadable
 import dev.ragnarok.fenrir.upload.MessageMethod
@@ -34,9 +35,9 @@ class StoryUploadable(private val context: Context, private val networker: INetw
         val serverSingle: Single<UploadServer> = if (initialServer == null) {
             if (upload.destination.messageMethod == MessageMethod.VIDEO) networker.vkDefault(
                 accountId
-            ).users().stories_getVideoUploadServer()
-                .map { it } else networker.vkDefault(accountId).users()
-                .stories_getPhotoUploadServer().map { it }
+            ).stories().stories_getVideoUploadServer(null, upload.destination.ref)
+                .map { it } else networker.vkDefault(accountId).stories()
+                .stories_getPhotoUploadServer(null, upload.destination.ref).map { it }
         } else {
             Single.just(initialServer)
         }
@@ -68,9 +69,12 @@ class StoryUploadable(private val context: Context, private val networker: INetw
                     )
                     .doFinally(safelyCloseAction(inputStream))
                     .flatMap { dto ->
+                        if (dto.error.nonNullNoEmpty()) {
+                            throw Exception(dto.error)
+                        }
                         networker
                             .vkDefault(accountId)
-                            .users()
+                            .stories()
                             .stories_save(dto.response?.upload_result)
                             .map {
                                 listEmptyIfNull(it.items)
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/DownloadWorkUtils.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/DownloadWorkUtils.kt
index 92959fc58..2cb155f21 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/DownloadWorkUtils.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/DownloadWorkUtils.kt
@@ -40,7 +40,8 @@ import java.io.File
 import java.io.FileOutputStream
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Date
 
 object DownloadWorkUtils {
     @SuppressLint("ConstantLocale")
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/FileUtil.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/FileUtil.kt
index b7b850c79..3fe469ecb 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/FileUtil.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/FileUtil.kt
@@ -9,25 +9,23 @@ import java.io.File
 import java.io.IOException
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import kotlin.random.Random
 
 object FileUtil {
-    private val Random = Random()
+    private val random = Random(System.nanoTime())
     private var PHOTO_DATE_FORMAT: DateFormat =
         SimpleDateFormat("yyyyMMdd_HHmmss", Utils.appLocale)
 
-
     fun updateDateLang() {
         PHOTO_DATE_FORMAT = SimpleDateFormat("yyyyMMdd_HHmmss", Utils.appLocale)
     }
 
-
     fun getExportedUriForFile(context: Context, file: File): Uri {
         return FileProvider.getUriForFile(context, Constants.FILE_PROVIDER_AUTHORITY, file)
     }
 
     @Suppress("DEPRECATION")
-
     @Throws(IOException::class)
     fun createImageFile(): File {
         val timeStamp = PHOTO_DATE_FORMAT.format(Date())
@@ -39,8 +37,7 @@ object FileUtil {
         var targetFile: File? = null
         var noExist = false
         while (!noExist) {
-            val randomInt = Random.nextInt(1000000)
-            val fileName = "Captured_" + timeStamp + "_" + randomInt + ".jpg"
+            val fileName = "Captured_" + timeStamp + "_" + random.nextInt(1000000) + ".jpg"
             val file = File(directory, fileName)
             if (!file.exists()) {
                 targetFile = file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/HelperSimple.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/HelperSimple.kt
index 29e28ac8b..c47d97265 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/HelperSimple.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/HelperSimple.kt
@@ -7,6 +7,7 @@ object HelperSimple {
     const val DIALOG_SEND_HELPER = "dialog_send_helper"
     const val PLAYLIST_HELPER = "playlist_helper"
     const val STORY_HELPER = "story_helper"
+    const val SHORT_VIDEO_HELPER = "short_video_helper"
     const val LOLLIPOP_21 = "lollipop21"
     const val AUDIO_DEAD = "audio_dead"
     const val HIDDEN_DIALOGS = "hidden_dialogs"
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/OkHttp3LoggingInterceptor.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/OkHttp3LoggingInterceptor.kt
index 439c1b5c7..81f35f411 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/OkHttp3LoggingInterceptor.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/OkHttp3LoggingInterceptor.kt
@@ -14,7 +14,7 @@ import okio.Buffer
 import okio.GzipSource
 import okio.source
 import java.io.IOException
-import java.util.*
+import java.util.TreeSet
 import java.util.concurrent.TimeUnit
 
 class OkHttp3LoggingInterceptor @JvmOverloads constructor(
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/Utils.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/Utils.kt
index 3671e60c3..79506183f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/Utils.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/Utils.kt
@@ -40,6 +40,9 @@ import dev.ragnarok.fenrir.activity.qr.CustomQRCodeWriter
 import dev.ragnarok.fenrir.api.HttpLoggerAndParser.toRequestBuilder
 import dev.ragnarok.fenrir.api.HttpLoggerAndParser.vkHeader
 import dev.ragnarok.fenrir.api.ProxyUtil.applyProxyConfig
+import dev.ragnarok.fenrir.api.model.VKApiCommunity
+import dev.ragnarok.fenrir.api.model.VKApiOwner
+import dev.ragnarok.fenrir.api.model.VKApiUser
 import dev.ragnarok.fenrir.api.model.interfaces.Identificable
 import dev.ragnarok.fenrir.api.model.interfaces.IdentificableOwner
 import dev.ragnarok.fenrir.link.internal.LinkActionAdapter
@@ -63,14 +66,15 @@ import io.reactivex.rxjava3.disposables.Disposable
 import okhttp3.*
 import java.io.Closeable
 import java.io.IOException
-import java.util.*
+import java.util.Calendar
+import java.util.LinkedList
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
 import kotlin.math.ceil
 import kotlin.math.floor
 import kotlin.math.roundToInt
 
-
 object Utils {
     private val reload_news: MutableList<Long> = LinkedList()
     private val reload_dialogs: MutableList<Long> = LinkedList()
@@ -709,6 +713,30 @@ object Utils {
         return -1
     }
 
+    fun ownerOfApiOwner(
+        users: List<VKApiUser>?,
+        groups: List<VKApiCommunity>?,
+        id: Long
+    ): VKApiOwner? {
+        if (users.isNullOrEmpty() && id >= 0 || groups.isNullOrEmpty() && id < 0) {
+            return null
+        }
+        if (id < 0) {
+            for (i in groups.orEmpty()) {
+                if (i.id == abs(id)) {
+                    return i
+                }
+            }
+        } else {
+            for (i in users.orEmpty()) {
+                if (i.id == id) {
+                    return i
+                }
+            }
+        }
+        return null
+    }
+
     fun firstNonEmptyString(vararg array: String?): String? {
         for (s in array) {
             if (!s.isNullOrEmpty()) {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistJVM.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistJVM.kt
index f0fbdd09d..3ff10751f 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistJVM.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistJVM.kt
@@ -14,7 +14,8 @@ import io.reactivex.rxjava3.core.CompletableEmitter
 import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
-import java.util.*
+import java.util.LinkedList
+import java.util.Locale
 import kotlin.math.abs
 
 class FileExistJVM : AbsFileExist {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistNative.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistNative.kt
index 8a2db4d8f..3c2758593 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistNative.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/existfile/FileExistNative.kt
@@ -15,7 +15,7 @@ import io.reactivex.rxjava3.core.CompletableEmitter
 import java.io.File
 import java.io.FileInputStream
 import java.io.IOException
-import java.util.*
+import java.util.Locale
 import kotlin.math.abs
 
 class FileExistNative : AbsFileExist {
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModKate.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModKate.kt
index dfda0d2bc..583912f06 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModKate.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModKate.kt
@@ -16,9 +16,9 @@ import okhttp3.Request
 import java.io.IOException
 import java.security.*
 import java.security.interfaces.RSAPrivateKey
-import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.experimental.and
+import kotlin.random.Random
 
 object TokenModKate {
     private const val rid = 1
@@ -69,7 +69,7 @@ object TokenModKate {
                 "4031819488942003867:1675892049294949499",
                 "3665846370517392830:3012248377502379040"
             )
-            val str3 = "AidLogin " + strArr[Random().nextInt(strArr.size - 1)]
+            val str3 = "AidLogin " + strArr[Random(System.nanoTime()).nextInt(strArr.size - 1)]
             val sb3 = receipt(str3)
             if (sb3.contains("REGISTRATION_ERROR")) {
                 println("Token register fail")
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModOfficialVK.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModOfficialVK.kt
index c6a565be2..57430b6ec 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModOfficialVK.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/util/refresh/TokenModOfficialVK.kt
@@ -17,9 +17,9 @@ import java.io.ByteArrayOutputStream
 import java.io.IOException
 import java.security.*
 import java.security.interfaces.RSAPrivateKey
-import java.util.*
 import java.util.concurrent.TimeUnit
 import kotlin.experimental.and
+import kotlin.random.Random
 
 object TokenModOfficialVK {
     private const val rid = 1
@@ -35,7 +35,7 @@ object TokenModOfficialVK {
         val valueOf = timestamp.toString()
         val byteArrayOutputStream = ByteArrayOutputStream()
         val bArr = ByteArray(24)
-        Random().nextBytes(bArr)
+        Random(System.nanoTime()).nextBytes(bArr)
         return try {
             byteArrayOutputStream.write(bArr)
             byteArrayOutputStream.write(valueOf.toByteArray())
@@ -86,7 +86,7 @@ object TokenModOfficialVK {
                 "4031819488942003867:1675892049294949499",
                 "3665846370517392830:3012248377502379040"
             )
-            val str3 = "AidLogin " + strArr[Random().nextInt(strArr.size - 1)]
+            val str3 = "AidLogin " + strArr[Random(System.nanoTime()).nextInt(strArr.size - 1)]
             var sb3 = receipt(str3, false)
             if (sb3.contains("REGISTRATION_ERROR")) {
                 println("Token register fail")
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CustomSeekBar.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CustomSeekBar.kt
index 728b344c7..b3e11f9a2 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CustomSeekBar.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/CustomSeekBar.kt
@@ -53,6 +53,7 @@ class CustomSeekBar @JvmOverloads constructor(
 
     private var layoutWidth: Int = 0
     private var layoutHeight: Int = 0
+    private var pendingPosition: Long = -1
 
     fun setCustomSeekBarListener(seekBarListener: CustomSeekBarListener?) {
         delegate = seekBarListener
@@ -144,7 +145,7 @@ class CustomSeekBar @JvmOverloads constructor(
 
     var position: Long
         get() = if (duration == -1L) -1L else (duration * thumbX.toDouble() / (layoutWidth - thumbWidth).toDouble()).toLong()
-        set(position) {
+        set(value) {
             if (duration <= 0) {
                 thumbX = 0
                 if (!isDragging) {
@@ -152,7 +153,8 @@ class CustomSeekBar @JvmOverloads constructor(
                 }
                 return
             }
-            thumbX = ceil(((layoutWidth - thumbWidth) * (position.toDouble() / duration))).toInt()
+            pendingPosition = value
+            thumbX = ceil(((layoutWidth - thumbWidth) * (value.toDouble() / duration))).toInt()
             if (thumbX < 0) {
                 thumbX = 0
             } else if (thumbX > layoutWidth - thumbWidth) {
@@ -174,6 +176,16 @@ class CustomSeekBar @JvmOverloads constructor(
 
     override fun draw(canvas: Canvas) {
         super.draw(canvas)
+        if (pendingPosition >= 0 && thumbX <= 0 && layoutWidth > 0) {
+            thumbX =
+                ceil(((layoutWidth - thumbWidth) * (pendingPosition.toDouble() / duration))).toInt()
+            if (thumbX < 0) {
+                thumbX = 0
+            } else if (thumbX > layoutWidth - thumbWidth) {
+                thumbX = layoutWidth - thumbWidth
+            }
+            pendingPosition = -1
+        }
         rect[(thumbWidth / 2).toFloat(), (layoutHeight / 2 - lineHeight / 2), (layoutWidth - thumbWidth / 2).toFloat()] =
             (layoutHeight / 2 + lineHeight / 2)
         paint.color = lineColor
@@ -308,8 +320,10 @@ class CustomSeekBar @JvmOverloads constructor(
                 Color.blue(cacheColor)
             )
         }
-        setDuration(20)
-        setBufferedPosition(18)
-        position = 10
+        if (isInEditMode) {
+            setDuration(20)
+            setBufferedPosition(18)
+            position = 8
+        }
     }
 }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/PhotosViewHelper.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/PhotosViewHelper.kt
index c2c7f1dba..4c75d4153 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/PhotosViewHelper.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/PhotosViewHelper.kt
@@ -24,7 +24,6 @@ import dev.ragnarok.fenrir.view.mozaik.MozaikLayout
 import dev.ragnarok.fenrir.view.natives.animation.AnimatedShapeableImageView
 import dev.ragnarok.fenrir.view.zoomhelper.ZoomHelper.Companion.addZoomableView
 import dev.ragnarok.fenrir.view.zoomhelper.ZoomHelper.Companion.removeZoomableView
-import java.util.*
 
 class PhotosViewHelper internal constructor(
     private val context: Context,
@@ -102,7 +101,7 @@ class PhotosViewHelper internal constructor(
         var images = photos
         if (container is MozaikLayout) {
             if (photos.size > 10) {
-                images = ArrayList<PostImage>(10)
+                images = ArrayList(10)
                 for (s in 0..9) images.add(photos[s])
             }
         }
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Randomizer.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Randomizer.kt
index 712e8519f..1adcc7c38 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Randomizer.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Randomizer.kt
@@ -16,10 +16,34 @@
 
 package dev.ragnarok.fenrir.view.snowfall
 
-import java.util.Random
+import kotlin.math.abs
+import kotlin.random.Random
 
 internal class Randomizer {
-    private val random by lazy { Random() }
+    private val random by lazy { Random(System.nanoTime()) }
+
+    private var nextNextGaussian = 0.0
+    private var haveNextNextGaussian = false
+    private fun nextGaussian(): Double {
+        // See Knuth, ACP, Section 3.4.1 Algorithm C.
+        return if (haveNextNextGaussian) {
+            haveNextNextGaussian = false
+            nextNextGaussian
+        } else {
+            var v1: Double
+            var v2: Double
+            var s: Double
+            do {
+                v1 = 2 * random.nextDouble() - 1 // between -1 and 1
+                v2 = 2 * random.nextDouble() - 1 // between -1 and 1
+                s = v1 * v1 + v2 * v2
+            } while (s >= 1 || s == 0.0)
+            val multiplier = StrictMath.sqrt(-2 * StrictMath.log(s) / s)
+            nextNextGaussian = v2 * multiplier
+            haveNextNextGaussian = true
+            v1 * multiplier
+        }
+    }
 
     fun randomDouble(max: Int): Double {
         return random.nextDouble() * (max + 1)
@@ -31,14 +55,14 @@ internal class Randomizer {
 
     fun randomInt(max: Int, gaussian: Boolean = false): Int {
         return if (gaussian) {
-            (kotlin.math.abs(randomGaussian()) * (max + 1)).toInt()
+            (abs(randomGaussian()) * (max + 1)).toInt()
         } else {
             random.nextInt(max + 1)
         }
     }
 
     private fun randomGaussian(): Double {
-        val gaussian = random.nextGaussian() / 3 // more 99% of instances in range (-1, 1)
+        val gaussian = nextGaussian() / 3 // more 99% of instances in range (-1, 1)
         return if (gaussian > -1 && gaussian < 1) gaussian else randomGaussian()
     }
 
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Snowflake.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Snowflake.kt
index a840d113f..3dc46c103 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Snowflake.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/snowfall/Snowflake.kt
@@ -22,6 +22,8 @@ import android.graphics.Color
 import android.graphics.Paint
 import android.graphics.Paint.Style
 import java.lang.Math.toRadians
+import kotlin.math.cos
+import kotlin.math.sin
 
 internal class Snowflake(val params: Params) {
     private var size: Int = 0
@@ -58,8 +60,8 @@ internal class Snowflake(val params: Params) {
             ((size - params.sizeMinInPx).toFloat() / (params.sizeMaxInPx - params.sizeMinInPx) *
                     (params.speedMax - params.speedMin) + params.speedMin)
         val angle = toRadians(randomizer.randomDouble(params.angleMax) * randomizer.randomSignum())
-        speedX = speed * kotlin.math.sin(angle)
-        speedY = speed * kotlin.math.cos(angle)
+        speedX = speed * sin(angle)
+        speedY = speed * cos(angle)
 
         alpha = randomizer.randomInt(params.alphaMin, params.alphaMax)
         paint.alpha = alpha
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/steppers/base/BaseHolderListener.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/steppers/base/BaseHolderListener.kt
index 34ddaa049..91882f188 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/steppers/base/BaseHolderListener.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/steppers/base/BaseHolderListener.kt
@@ -1,8 +1,6 @@
 package dev.ragnarok.fenrir.view.steppers.base
 
-import java.util.EventListener
-
-interface BaseHolderListener : EventListener {
+interface BaseHolderListener {
     fun onNextButtonClick(step: Int)
     fun onCancelButtonClick(step: Int)
 }
\ No newline at end of file
diff --git a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/zoomhelper/PlaceHolderView.kt b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/zoomhelper/PlaceHolderView.kt
index 15faec223..c4703bf94 100644
--- a/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/zoomhelper/PlaceHolderView.kt
+++ b/app_fenrir/src/main/kotlin/dev/ragnarok/fenrir/view/zoomhelper/PlaceHolderView.kt
@@ -11,7 +11,7 @@ internal class PlaceHolderView(context: Context?) : View(context) {
         this.view = view
     }
 
-    override fun onDraw(canvas: Canvas?) {
+    override fun onDraw(canvas: Canvas) {
         if (view != null && isEnabled) {
             (view ?: return).draw(canvas)
             return
diff --git a/app_fenrir/src/main/res/drawable/clip_outline.xml b/app_fenrir/src/main/res/drawable/clip_outline.xml
new file mode 100644
index 000000000..af27843e6
--- /dev/null
+++ b/app_fenrir/src/main/res/drawable/clip_outline.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:pathData="M10.286,22.329C6.238,22.329 2.957,19.048 2.957,15h1.8c0,3.053 2.475,5.529 5.529,5.529h0.429c0.497,0 0.9,0.403 0.9,0.9 0,0.497 -0.403,0.9 -0.9,0.9z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="m13.671,9.429c0,-0.497 0.403,-0.9 0.9,-0.9 1.888,0 3.545,0.996 4.452,2.49 0.258,0.425 0.123,0.979 -0.302,1.236 -0.425,0.258 -0.979,0.123 -1.236,-0.302 -0.589,-0.97 -1.671,-1.624 -2.913,-1.624 -0.497,0 -0.9,-0.403 -0.9,-0.9z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="m7.391,3.9c-0.681,0 -1.216,0.583 -1.157,1.262L6.771,11.337 4.999,11.73 4.441,5.318c-0.15,-1.73 1.213,-3.217 2.95,-3.217 1.359,0 2.543,0.925 2.873,2.243l0.895,3.582C11.279,8.407 10.986,8.895 10.504,9.016 10.022,9.137 9.533,8.843 9.413,8.361L8.517,4.779C8.388,4.263 7.924,3.9 7.391,3.9Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M13.395,3.47C12.77,3.331 12.152,3.728 12.018,4.354L11.166,8.331C11.062,8.818 10.583,9.127 10.097,9.023 9.611,8.919 9.302,8.44 9.406,7.954l0.852,-3.978c0.343,-1.603 1.927,-2.619 3.527,-2.264 1.496,0.332 2.489,1.754 2.286,3.273L15.464,9.548C15.398,10.04 14.945,10.386 14.453,10.321 13.96,10.255 13.614,9.802 13.679,9.31L14.288,4.748C14.367,4.155 13.979,3.6 13.395,3.47Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M9.792,12.64C9.667,12.078 9.151,11.692 8.577,11.73l-0.811,0.054C6.073,11.897 4.757,13.303 4.757,15h-1.8c0,-2.644 2.05,-4.836 4.689,-5.012L8.457,9.934c1.461,-0.097 2.774,0.886 3.092,2.315 0.369,1.659 -0.73,3.288 -2.407,3.568L8.719,15.888C8.229,15.969 7.765,15.638 7.684,15.148 7.602,14.658 7.933,14.194 8.423,14.112L8.846,14.042C9.505,13.932 9.937,13.292 9.792,12.64Z" />
+    <path
+        android:fillColor="#fff"
+        android:pathData="M15.082,12.82C14.198,12.835 13.395,13.548 13.395,14.541L13.395,20.529C13.395,21.853 14.825,22.68 15.967,22.016L21.113,19.021C22.251,18.359 22.251,16.711 21.113,16.049L15.967,13.055C15.681,12.889 15.377,12.816 15.082,12.82zM15.395,15.037L19.691,17.535L15.395,20.033L15.395,15.037z" />
+</vector>
diff --git a/app_fenrir/src/main/res/drawable/story_outline.xml b/app_fenrir/src/main/res/drawable/story_outline.xml
new file mode 100644
index 000000000..feed0e2a3
--- /dev/null
+++ b/app_fenrir/src/main/res/drawable/story_outline.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#fff"
+        android:fillType="evenOdd"
+        android:pathData="M10.3,3h-0.039c-1.087,0 -1.958,0 -2.662,0.058 -0.723,0.059 -1.348,0.183 -1.924,0.477A4.9,4.9 0,0 0,3.534 5.675c-0.293,0.576 -0.418,1.202 -0.477,1.924C3,8.303 3,9.174 3,10.261v3.478c0,1.087 0,1.958 0.058,2.662 0.059,0.723 0.183,1.348 0.477,1.924a4.9,4.9 0,0 0,2.141 2.141c0.576,0.293 1.202,0.418 1.924,0.477C8.303,21 9.174,21 10.261,21h3.478c1.087,0 1.958,0 2.661,-0.058 0.723,-0.059 1.348,-0.183 1.924,-0.477a4.9,4.9 0,0 0,2.141 -2.141c0.293,-0.576 0.418,-1.202 0.477,-1.924C21,15.697 21,14.826 21,13.739v-3.478c0,-1.087 0,-1.958 -0.058,-2.661 -0.059,-0.723 -0.183,-1.348 -0.477,-1.924a4.9,4.9 0,0 0,-2.141 -2.141c-0.576,-0.293 -1.202,-0.418 -1.924,-0.477C15.697,3 14.826,3 13.739,3H10.3ZM6.493,5.138c0.28,-0.143 0.642,-0.236 1.253,-0.286C8.368,4.801 9.165,4.8 10.3,4.8h3.4c1.135,0 1.932,0.001 2.554,0.052 0.611,0.05 0.974,0.144 1.253,0.286a3.1,3.1 0,0 1,1.355 1.355c0.143,0.28 0.236,0.642 0.286,1.253 0.051,0.622 0.052,1.419 0.052,2.554v3.4c0,1.135 -0.001,1.932 -0.052,2.554 -0.05,0.611 -0.144,0.974 -0.286,1.253a3.1,3.1 0,0 1,-1.355 1.355c-0.28,0.143 -0.642,0.236 -1.253,0.286 -0.622,0.051 -1.419,0.052 -2.554,0.052h-3.4c-1.135,0 -1.932,-0.001 -2.554,-0.052 -0.611,-0.05 -0.974,-0.144 -1.253,-0.286a3.1,3.1 0,0 1,-1.355 -1.355c-0.143,-0.28 -0.236,-0.642 -0.286,-1.253C4.801,15.632 4.8,14.835 4.8,13.7v-3.4c0,-1.135 0.001,-1.932 0.052,-2.554 0.05,-0.611 0.144,-0.974 0.286,-1.253A3.1,3.1 0,0 1,6.493 5.138ZM9.801,12c0,-1.214 0.984,-2.199 2.199,-2.199 1.214,0 2.199,0.984 2.199,2.199 0,1.214 -0.985,2.199 -2.199,2.199 -1.214,0 -2.199,-0.985 -2.199,-2.199ZM12,8.001c-2.209,0 -3.999,1.79 -3.999,3.999S9.791,15.999 12,15.999c2.209,0 3.999,-1.791 3.999,-3.999 0,-2.209 -1.79,-3.999 -3.999,-3.999Z"
+        tools:ignore="VectorPath" />
+</vector>
diff --git a/app_fenrir/src/main/res/layout/activity_shortvideo_pager.xml b/app_fenrir/src/main/res/layout/activity_shortvideo_pager.xml
new file mode 100644
index 000000000..914bc4d04
--- /dev/null
+++ b/app_fenrir/src/main/res/layout/activity_shortvideo_pager.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/shortvideo_pager_root"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@android:color/black">
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/view_pager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical" />
+
+    <dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+        android:id="@+id/loading_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        app:loopAnimation="true" />
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/toolbar_semitransparent"
+        android:clipToPadding="true"
+        android:theme="@style/Theme.Toolbar.Video"
+        app:subtitleTextAppearance="@style/TextAppearance.Material3.BodySmall"
+        app:subtitleTextColor="?colorSecondary">
+
+        <LinearLayout
+            android:layout_width="56dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="end"
+            android:layout_marginEnd="8dp"
+            android:orientation="vertical">
+
+            <ImageView
+                android:id="@+id/toolbar_avatar"
+                android:layout_width="45dp"
+                android:layout_height="45dp"
+                android:layout_gravity="center"
+                android:alpha="0.8"
+                android:contentDescription="@null"
+                android:stateListAnimator="@animator/clicked" />
+
+            <TextView
+                android:id="@+id/item_short_video_length"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:maxLines="1"
+                android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
+                android:textColor="@color/white"
+                android:textSize="12sp"
+                tools:text="Expires" />
+        </LinearLayout>
+    </com.google.android.material.appbar.MaterialToolbar>
+
+    <LinearLayout
+        android:id="@+id/buttons"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:orientation="horizontal">
+
+        <dev.ragnarok.fenrir.view.CircleCounterButton
+            android:id="@+id/like_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="25"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:stateListAnimator="@animator/clicked"
+            app:active="false"
+            app:active_background_color="?attr/icon_color_active"
+            app:always_counter="false"
+            app:button_icon="@drawable/heart"
+            app:noactive_icon_color="#fff" />
+
+        <dev.ragnarok.fenrir.view.CircleCounterButton
+            android:id="@+id/comments_button"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="25"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:stateListAnimator="@animator/clicked"
+            app:active="true"
+            app:active_background_color="?attr/icon_color_active"
+            app:always_counter="false"
+            app:button_icon="@drawable/comment"
+            app:noactive_icon_color="#fff" />
+
+        <dev.ragnarok.fenrir.view.CircleCounterButton
+            android:id="@+id/button_download"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="25"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:stateListAnimator="@animator/clicked"
+            app:active="true"
+            app:active_background_color="?attr/icon_color_active"
+            app:always_counter="false"
+            app:button_icon="@drawable/download"
+            app:noactive_icon_color="#fff" />
+
+        <dev.ragnarok.fenrir.view.CircleCounterButton
+            android:id="@+id/button_share"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="25"
+            android:background="?attr/selectableItemBackgroundBorderless"
+            android:stateListAnimator="@animator/clicked"
+            app:active="true"
+            app:active_background_color="?attr/icon_color_active"
+            app:always_counter="false"
+            app:button_icon="@drawable/share"
+            app:noactive_icon_color="#fff" />
+    </LinearLayout>
+
+    <dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+        android:id="@+id/swipe_helper"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true"
+        android:layout_margin="8dp"
+        android:visibility="gone"
+        app:loopAnimation="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app_fenrir/src/main/res/layout/fragment_story_pager.xml b/app_fenrir/src/main/res/layout/activity_story_pager.xml
similarity index 100%
rename from app_fenrir/src/main/res/layout/fragment_story_pager.xml
rename to app_fenrir/src/main/res/layout/activity_story_pager.xml
diff --git a/app_fenrir/src/main/res/layout/content_shortvideo_page.xml b/app_fenrir/src/main/res/layout/content_shortvideo_page.xml
new file mode 100644
index 000000000..1e1971dae
--- /dev/null
+++ b/app_fenrir/src/main/res/layout/content_shortvideo_page.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <dev.ragnarok.fenrir.view.ExpandableSurfaceView
+        android:id="@+id/videoSurface"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_centerInParent="true" />
+
+
+    <dev.ragnarok.fenrir.view.natives.rlottie.RLottieImageView
+        android:id="@+id/preparing_progress_bar"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:visibility="gone"
+        app:loopAnimation="true" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app_fenrir/src/main/res/layout/fragment_wall.xml b/app_fenrir/src/main/res/layout/fragment_wall.xml
index 1225a1ff6..27d09761f 100644
--- a/app_fenrir/src/main/res/layout/fragment_wall.xml
+++ b/app_fenrir/src/main/res/layout/fragment_wall.xml
@@ -22,6 +22,20 @@
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
+    <LinearLayout
+        android:id="@+id/uploads_root"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:orientation="vertical">
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/uploads_recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="96dp"
+            android:scrollbars="horizontal" />
+
+    </LinearLayout>
 
     <!--app:layout_anchor="@android:id/list"-->
     <!--app:layout_anchorGravity="bottom|right|end"-->
diff --git a/app_fenrir/src/main/res/layout/header_group.xml b/app_fenrir/src/main/res/layout/header_group.xml
index 5b642c38b..9c2cecec2 100644
--- a/app_fenrir/src/main/res/layout/header_group.xml
+++ b/app_fenrir/src/main/res/layout/header_group.xml
@@ -520,6 +520,33 @@
 
             </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/header_group_clips_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="8dp"
+                android:stateListAnimator="@animator/clicked">
+
+                <TextView
+                    android:id="@+id/header_group_bclips"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/ProfileText" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+
+                    android:gravity="center"
+                    android:text="@string/counter_clips"
+                    android:textAppearance="@style/ProfileSubText" />
+
+            </LinearLayout>
+
             <TextView
                 android:id="@+id/header_group_contacts_container"
                 android:layout_width="wrap_content"
diff --git a/app_fenrir/src/main/res/layout/header_user_profile.xml b/app_fenrir/src/main/res/layout/header_user_profile.xml
index 788315141..c48fc7871 100644
--- a/app_fenrir/src/main/res/layout/header_user_profile.xml
+++ b/app_fenrir/src/main/res/layout/header_user_profile.xml
@@ -438,6 +438,32 @@
                     android:textAppearance="@style/ProfileSubText" />
 
             </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/header_user_profile_clips_container"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="8dp"
+                android:stateListAnimator="@animator/clicked">
+
+                <TextView
+                    android:id="@+id/fragment_user_profile_bclips"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="@style/ProfileText" />
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/counter_clips"
+                    android:textAppearance="@style/ProfileSubText" />
+
+            </LinearLayout>
         </LinearLayout>
     </HorizontalScrollView>
 
diff --git a/app_fenrir/src/main/res/layout/item_group_with_like.xml b/app_fenrir/src/main/res/layout/item_group_with_like.xml
new file mode 100644
index 000000000..9a41a374a
--- /dev/null
+++ b/app_fenrir/src/main/res/layout/item_group_with_like.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:orientation="horizontal"
+    android:paddingTop="8dp">
+
+    <FrameLayout
+        android:id="@+id/avatar_root"
+        android:layout_width="@dimen/avatar_size_usual"
+        android:layout_height="@dimen/avatar_size_usual"
+        android:layout_marginStart="16dp">
+
+        <ImageView
+            android:id="@+id/item_group_avatar"
+            android:layout_width="@dimen/avatar_size_usual"
+            android:layout_height="@dimen/avatar_size_usual"
+            android:contentDescription="@null"
+            tools:src="@drawable/ic_feedback_invite_group" />
+
+        <ImageView
+            android:id="@+id/item_verified"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="top|end"
+            android:background="@drawable/sel_button_round_5_white"
+            android:backgroundTint="#009900"
+            android:backgroundTintMode="add"
+            android:contentDescription="@null"
+            android:padding="3dp"
+            android:src="@drawable/verified"
+            android:visibility="gone"
+            app:tint="@color/white" />
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/item_group_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:scrollbars="none"
+            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+            tools:text="Fenrir for VK" />
+
+        <TextView
+            android:id="@+id/item_group_type"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:scrollbars="none"
+            android:textAppearance="@style/TextAppearance.Material3.TitleSmall"
+            android:textSize="@dimen/font_size_subtitle"
+            tools:text="Сообщество" />
+
+        <TextView
+            android:id="@+id/item_group_members"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:scrollbars="none"
+            android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+            android:textSize="@dimen/font_size_subtitle"
+            tools:text="31 подписок" />
+
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/item_group_liked"
+        android:layout_width="@dimen/online_dot_size"
+        android:layout_height="@dimen/online_dot_size"
+        android:layout_gravity="center_vertical"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@null"
+        android:src="@drawable/heart_filled"
+        app:tint="?colorPrimary" />
+
+</LinearLayout>
diff --git a/app_fenrir/src/main/res/layout/item_people_with_like.xml b/app_fenrir/src/main/res/layout/item_people_with_like.xml
new file mode 100644
index 000000000..a99c10496
--- /dev/null
+++ b/app_fenrir/src/main/res/layout/item_people_with_like.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/selectableItemBackground"
+    android:minHeight="64dp">
+
+    <FrameLayout
+        android:id="@+id/avatar_root"
+        android:layout_width="@dimen/avatar_size_usual"
+        android:layout_height="@dimen/avatar_size_usual"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="16dp">
+
+        <ImageView
+            android:id="@+id/item_people_avatar"
+            android:layout_width="@dimen/avatar_size_usual"
+            android:layout_height="@dimen/avatar_size_usual"
+            android:contentDescription="@null" />
+
+        <ImageView
+            android:id="@+id/item_verified"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="top|start"
+            android:background="@drawable/sel_button_round_5_white"
+            android:backgroundTint="#009900"
+            android:backgroundTintMode="add"
+            android:contentDescription="@null"
+            android:padding="3dp"
+            android:src="@drawable/verified"
+            android:visibility="gone"
+            app:tint="@color/white" />
+
+        <ImageView
+            android:id="@+id/item_blacklisted"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="top|end"
+            android:contentDescription="@null"
+            android:src="@drawable/audio_died"
+            android:visibility="gone"
+            app:tint="#AAFF0000" />
+
+        <dev.ragnarok.fenrir.view.OnlineView
+            android:id="@+id/item_people_online"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:layout_gravity="bottom|end"
+            android:padding="3dp"
+            app:circle_color="?icon_color_active"
+            app:stroke_color="?android:colorBackground" />
+
+    </FrameLayout>
+
+    <TextView
+        android:id="@+id/item_people_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="16dp"
+        android:layout_toStartOf="@id/item_people_liked"
+        android:layout_toEndOf="@id/avatar_root"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
+        tools:text="Name" />
+
+    <TextView
+        android:id="@+id/item_people_subtitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/item_people_name"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_toStartOf="@id/item_people_liked"
+        android:layout_toEndOf="@id/avatar_root"
+        android:ellipsize="end"
+        android:maxLines="2"
+        android:textAppearance="@style/TextAppearance.Material3.BodySmall"
+        tools:text="Time" />
+
+    <ImageView
+        android:id="@+id/item_people_liked"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="16dp"
+        android:contentDescription="@null"
+        android:src="@drawable/heart_filled"
+        app:tint="?colorPrimary" />
+
+</RelativeLayout>
diff --git a/app_fenrir/src/main/res/values-be/strings.xml b/app_fenrir/src/main/res/values-be/strings.xml
index e52f4fe50..990c45725 100644
--- a/app_fenrir/src/main/res/values-be/strings.xml
+++ b/app_fenrir/src/main/res/values-be/strings.xml
@@ -651,6 +651,7 @@
     <string name="counter_markets">тавары</string>
     <string name="counter_markets_services">паслугі</string>
     <string name="counter_narratives">сюжэты</string>
+    <string name="counter_clips">кліпы</string>
 
     <string name="topic_comments_counter">апошняе абнаўленне: %1$s | %2$d каментароў</string>
     <string name="group_chats_counter">апошняе паведамленне: %1$s | %2$d удзельнікаў</string>
@@ -1712,4 +1713,7 @@
     <string name="available_only_dons">Даступна толькі донам!</string>
     <string name="font_only_for_chats">Шрыфт толькі чатам</string>
     <string name="views">Прагляды</string>
+    <string name="answer">Адказаць</string>
+    <string name="clips">Кліпы</string>
+    <string name="stories">Гісторыі</string>
 </resources>
\ No newline at end of file
diff --git a/app_fenrir/src/main/res/values-ru/strings.xml b/app_fenrir/src/main/res/values-ru/strings.xml
index bc1f3c96b..f4ba45bbe 100644
--- a/app_fenrir/src/main/res/values-ru/strings.xml
+++ b/app_fenrir/src/main/res/values-ru/strings.xml
@@ -652,6 +652,7 @@
     <string name="counter_markets">товары</string>
     <string name="counter_markets_services">услуги</string>
     <string name="counter_narratives">сюжеты</string>
+    <string name="counter_clips">клипы</string>
 
     <string name="topic_comments_counter">последнее обновление: %1$s | %2$d комментариев</string>
     <string name="group_chats_counter">последнее сообщение: %1$s | %2$d участников</string>
@@ -1714,4 +1715,7 @@
     <string name="available_only_dons">Доступно только донам!</string>
     <string name="font_only_for_chats">Шрифт только чатам</string>
     <string name="views">Просмотры</string>
+    <string name="answer">Ответить</string>
+    <string name="clips">Клипы</string>
+    <string name="stories">Истории</string>
 </resources>
\ No newline at end of file
diff --git a/app_fenrir/src/main/res/values/strings.xml b/app_fenrir/src/main/res/values/strings.xml
index d66cdec2d..1383d9b03 100644
--- a/app_fenrir/src/main/res/values/strings.xml
+++ b/app_fenrir/src/main/res/values/strings.xml
@@ -845,6 +845,7 @@
     <string name="counter_markets">products</string>
     <string name="counter_markets_services">services</string>
     <string name="counter_narratives">narratives</string>
+    <string name="counter_clips">clips</string>
 
     <string name="topic_comments_counter">last update: %1$s | %2$d comments</string>
     <string name="group_chats_counter">last message: %1$s | %2$d members</string>
@@ -1951,4 +1952,7 @@
     <string name="available_only_dons">Only available to dons!</string>
     <string name="font_only_for_chats">Font only for chats</string>
     <string name="views">Views</string>
+    <string name="answer">Answer</string>
+    <string name="clips">Clips</string>
+    <string name="stories">Stories</string>
 </resources>
diff --git a/app_filegallery/build.gradle b/app_filegallery/build.gradle
index 1983e66c5..61d350e1c 100644
--- a/app_filegallery/build.gradle
+++ b/app_filegallery/build.gradle
@@ -18,6 +18,7 @@ android {
         exclude("META-INF/LICENSE")
         exclude("META-INF/NOTICE")
         exclude("META-INF/*.version")
+        exclude("META-INF/versions/**")
     }
 
     dependenciesInfo {
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/Constants.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/Constants.kt
index 496811ba9..bc6edca44 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/Constants.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/Constants.kt
@@ -3,7 +3,7 @@ package dev.ragnarok.filegallery
 import android.os.Build
 import dev.ragnarok.filegallery.BuildConfig.*
 import dev.ragnarok.filegallery.util.Utils
-import java.util.*
+import java.util.Locale
 
 object Constants {
     const val PICASSO_TAG = "picasso_tag"
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/crash/CrashUtils.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/crash/CrashUtils.kt
index aa4197515..557450039 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/crash/CrashUtils.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/crash/CrashUtils.kt
@@ -14,7 +14,8 @@ import java.io.PrintWriter
 import java.io.StringWriter
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 object CrashUtils {
     private const val TAG = "CrashUtils"
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerActivity.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerActivity.kt
index 72e20f48c..c497c0753 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerActivity.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerActivity.kt
@@ -53,7 +53,6 @@ import dev.ragnarok.filegallery.view.natives.rlottie.RLottieImageView
 import dev.ragnarok.filegallery.view.pager.WeakPicassoLoadCallback
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
-import java.util.*
 import java.util.concurrent.TimeUnit
 
 
@@ -277,7 +276,7 @@ class PhotoPagerActivity : BaseMvpActivity<PhotoPagerPresenter, IPhotoPagerView>
     override fun displayPhotos(photos: List<Photo>, initialIndex: Int) {
         if (bShowPhotosLine) {
             if (photos.size <= 1) {
-                mAdapterRecycler.setData(Collections.emptyList())
+                mAdapterRecycler.setData(emptyList())
                 mAdapterRecycler.notifyDataSetChanged()
             } else {
                 mAdapterRecycler.setData(photos)
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerPresenter.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerPresenter.kt
index aff38a497..f48328813 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerPresenter.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/photopager/PhotoPagerPresenter.kt
@@ -31,7 +31,9 @@ import dev.ragnarok.filegallery.util.AssertUtils
 import dev.ragnarok.filegallery.util.DownloadWorkUtils.doDownloadPhoto
 import dev.ragnarok.filegallery.util.Utils
 import java.io.File
-import java.util.*
+import java.util.Calendar
+import java.util.EnumMap
+import java.util.EnumSet
 
 open class PhotoPagerPresenter internal constructor(
     initialData: ArrayList<Photo>,
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/qr/CameraScanActivity.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/qr/CameraScanActivity.kt
index 9224afbf8..bca547db6 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/qr/CameraScanActivity.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/activity/qr/CameraScanActivity.kt
@@ -32,7 +32,8 @@ import dev.ragnarok.filegallery.util.AppPerms
 import dev.ragnarok.filegallery.util.AppPerms.requestPermissionsResultAbs
 import dev.ragnarok.filegallery.util.Utils
 import java.nio.ByteBuffer
-import java.util.*
+import java.util.EnumMap
+import java.util.EnumSet
 
 class CameraScanActivity : NoMainActivity() {
     private lateinit var textureView: PreviewView
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/db/impl/SearchRequestHelperStorage.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/db/impl/SearchRequestHelperStorage.kt
index 0632f49b2..4d143f446 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/db/impl/SearchRequestHelperStorage.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/db/impl/SearchRequestHelperStorage.kt
@@ -26,7 +26,6 @@ import io.reactivex.rxjava3.core.CompletableEmitter
 import io.reactivex.rxjava3.core.Single
 import io.reactivex.rxjava3.core.SingleEmitter
 import java.io.File
-import java.util.Collections
 
 class SearchRequestHelperStorage internal constructor(context: Context) :
     ISearchRequestHelperStorage {
@@ -447,7 +446,7 @@ class SearchRequestHelperStorage internal constructor(context: Context) :
                     val cv = ContentValues()
                     cv.put(TagOwnerColumns.NAME, p.name)
                     val v = Math.toIntExact(db.insert(TagOwnerColumns.TABLENAME, null, cv))
-                    for (kk in (p.dirs ?: Collections.emptyList())) {
+                    for (kk in (p.dirs ?: emptyList())) {
                         val cvDir = ContentValues()
                         cvDir.put(TagDirsColumns.OWNER_ID, v)
                         cvDir.put(TagDirsColumns.NAME, kk.name)
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanager/FileManagerFragment.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanager/FileManagerFragment.kt
index c3fe58177..270872f58 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanager/FileManagerFragment.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanager/FileManagerFragment.kt
@@ -64,7 +64,6 @@ import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
 import java.io.File
 import java.util.Calendar
-import java.util.Collections
 import java.util.concurrent.TimeUnit
 
 class FileManagerFragment : BaseMvpFragment<FileManagerPresenter, IFileManagerView>(),
@@ -211,7 +210,7 @@ class FileManagerFragment : BaseMvpFragment<FileManagerPresenter, IFileManagerVi
             }
         }
         ViewUtils.setupSwipeRefreshLayoutWithCurrentTheme(requireActivity(), mSwipeRefreshLayout)
-        mAdapter = FileManagerAdapter(requireActivity(), Collections.emptyList())
+        mAdapter = FileManagerAdapter(requireActivity(), emptyList())
         mAdapter?.setClickListener(this)
         mRecyclerView?.adapter = mAdapter
 
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanagerselect/FileManagerSelectFragment.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanagerselect/FileManagerSelectFragment.kt
index f036ab1f6..5ee490bd1 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanagerselect/FileManagerSelectFragment.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/filemanagerselect/FileManagerSelectFragment.kt
@@ -36,7 +36,6 @@ import dev.ragnarok.filegallery.view.natives.rlottie.RLottieImageView
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
 import java.io.File
-import java.util.Collections
 import java.util.concurrent.TimeUnit
 
 
@@ -140,7 +139,7 @@ class FileManagerSelectFragment :
         mHeader?.visibility =
             if (arguments?.getBoolean(Extra.HIDE_TITLE, false) == true) View.GONE else View.VISIBLE
 
-        mAdapter = FileManagerSelectAdapter(Collections.emptyList())
+        mAdapter = FileManagerSelectAdapter(emptyList())
         mAdapter?.setClickListener(this)
         mRecyclerView?.adapter = mAdapter
 
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt
index d89045cdb..b7f71583b 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/fragment/localserver/filemanagerremote/FileManagerRemoteFragment.kt
@@ -46,7 +46,6 @@ import dev.ragnarok.filegallery.view.MySearchView
 import dev.ragnarok.filegallery.view.natives.rlottie.RLottieImageView
 import io.reactivex.rxjava3.core.Completable
 import io.reactivex.rxjava3.disposables.Disposable
-import java.util.Collections
 import java.util.concurrent.TimeUnit
 
 class FileManagerRemoteFragment :
@@ -150,7 +149,7 @@ class FileManagerRemoteFragment :
         }
         ViewUtils.setupSwipeRefreshLayoutWithCurrentTheme(requireActivity(), mSwipeRefreshLayout)
 
-        mAdapter = FileManagerRemoteAdapter(requireActivity(), Collections.emptyList())
+        mAdapter = FileManagerRemoteAdapter(requireActivity(), emptyList())
         mAdapter?.setClickListener(this)
         mRecyclerView?.adapter = mAdapter
 
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackController.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackController.kt
index d14d3ecc3..20db5aa65 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackController.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackController.kt
@@ -1,7 +1,13 @@
 package dev.ragnarok.filegallery.media.music
 
 import android.app.Activity
-import android.content.*
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.ServiceConnection
 import android.os.IBinder
 import android.os.RemoteException
 import dev.ragnarok.filegallery.R
@@ -11,7 +17,7 @@ import dev.ragnarok.filegallery.util.Logger
 import dev.ragnarok.filegallery.util.existfile.AbsFileExist
 import io.reactivex.rxjava3.core.Observable
 import io.reactivex.rxjava3.subjects.PublishSubject
-import java.util.*
+import java.util.WeakHashMap
 
 object MusicPlaybackController {
     val Audios: MutableMap<Int, ArrayList<Audio>> = LinkedHashMap()
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackService.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackService.kt
index bc02585d2..3959e3afd 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackService.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/media/music/MusicPlaybackService.kt
@@ -228,7 +228,7 @@ class MusicPlaybackService : Service() {
         audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, audioSessionId)
         audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, packageName)
         sendBroadcast(audioEffectsIntent)
-        mAlarmManager?.cancel(mShutdownIntent)
+        mShutdownIntent?.let { mAlarmManager?.cancel(it) }
         mPlayer?.release()
         mMediaSession?.release()
         mNotificationHelper?.killNotification()
@@ -340,10 +340,12 @@ class MusicPlaybackService : Service() {
 
     private fun scheduleDelayedShutdown() {
         if (Constants.IS_DEBUG) Log.v(TAG, "Scheduling shutdown in $IDLE_DELAY ms")
-        mAlarmManager?.set(
-            AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + IDLE_DELAY,
-            mShutdownIntent
-        )
+        mShutdownIntent?.let {
+            mAlarmManager?.set(
+                AlarmManager.ELAPSED_REALTIME_WAKEUP, SystemClock.elapsedRealtime() + IDLE_DELAY,
+                it
+            )
+        }
         mShutdownScheduled = true
     }
 
@@ -353,7 +355,7 @@ class MusicPlaybackService : Service() {
             "Cancelling delayed shutdown, scheduled = $mShutdownScheduled"
         )
         if (mShutdownScheduled) {
-            mAlarmManager?.cancel(mShutdownIntent)
+            mShutdownIntent?.let { mAlarmManager?.cancel(it) }
             mShutdownScheduled = false
         }
     }
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/IUploadManager.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/IUploadManager.kt
index feddd84b3..e9c02d3e4 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/IUploadManager.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/IUploadManager.kt
@@ -13,7 +13,7 @@ interface IUploadManager {
     fun getCurrent(): Optional<Upload>
     fun observeDeleting(includeCompleted: Boolean): Flowable<IntArray>
     fun observeAdding(): Flowable<List<Upload>>
-    fun obseveStatus(): Flowable<Upload>
+    fun observeStatus(): Flowable<Upload>
     fun observeResults(): Flowable<Pair<Upload, UploadResult<*>>>
     fun observeProgress(): Flowable<List<IProgressUpdate>>
     interface IProgressUpdate {
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/Upload.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/Upload.kt
index 7876ad143..6940c2048 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/Upload.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/Upload.kt
@@ -7,8 +7,8 @@ import dev.ragnarok.filegallery.readTypedObjectCompat
 import dev.ragnarok.filegallery.util.ParcelUtils.readObjectLong
 import dev.ragnarok.filegallery.util.ParcelUtils.writeObjectLong
 import dev.ragnarok.filegallery.writeTypedObjectCompat
-import java.util.Random
 import java.util.concurrent.atomic.AtomicInteger
+import kotlin.random.Random
 
 open class Upload : Parcelable {
 
@@ -151,6 +151,6 @@ open class Upload : Parcelable {
                 return arrayOfNulls(size)
             }
         }
-        val IDGEN = AtomicInteger(Random().nextInt(5000))
+        val IDGEN = AtomicInteger(Random(System.nanoTime()).nextInt(5000))
     }
 }
\ No newline at end of file
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/UploadManagerImpl.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/UploadManagerImpl.kt
index c9c116573..c73aecb1e 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/UploadManagerImpl.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/upload/UploadManagerImpl.kt
@@ -291,7 +291,7 @@ class UploadManagerImpl(
         return addingProcessor.onBackpressureBuffer()
     }
 
-    override fun obseveStatus(): Flowable<Upload> {
+    override fun observeStatus(): Flowable<Upload> {
         return statusProcessor.onBackpressureBuffer()
     }
 
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/DownloadWorkUtils.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/DownloadWorkUtils.kt
index 252ed16cd..1eab6c771 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/DownloadWorkUtils.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/DownloadWorkUtils.kt
@@ -28,7 +28,9 @@ import java.io.File
 import java.io.FileOutputStream
 import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Calendar
+import java.util.Date
+import java.util.Locale
 
 object DownloadWorkUtils {
     @SuppressLint("ConstantLocale")
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/OkHttp3LoggingInterceptor.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/OkHttp3LoggingInterceptor.kt
index 53e3ded74..a9be36b7f 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/OkHttp3LoggingInterceptor.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/OkHttp3LoggingInterceptor.kt
@@ -14,7 +14,7 @@ import okio.Buffer
 import okio.GzipSource
 import okio.source
 import java.io.IOException
-import java.util.*
+import java.util.TreeSet
 import java.util.concurrent.TimeUnit
 
 class OkHttp3LoggingInterceptor @JvmOverloads constructor(
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/Utils.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/Utils.kt
index d72d6a1fa..4587ad5b6 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/Utils.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/util/Utils.kt
@@ -33,7 +33,7 @@ import okhttp3.Interceptor
 import okhttp3.OkHttpClient
 import java.io.Closeable
 import java.io.IOException
-import java.util.*
+import java.util.Locale
 import java.util.concurrent.TimeUnit
 import kotlin.math.abs
 import kotlin.math.ceil
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/CustomSeekBar.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/CustomSeekBar.kt
index e555b9f2a..7f29bd0ef 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/CustomSeekBar.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/CustomSeekBar.kt
@@ -53,6 +53,7 @@ class CustomSeekBar @JvmOverloads constructor(
 
     private var layoutWidth: Int = 0
     private var layoutHeight: Int = 0
+    private var pendingPosition: Long = -1
 
     fun setCustomSeekBarListener(seekBarListener: CustomSeekBarListener?) {
         delegate = seekBarListener
@@ -144,7 +145,7 @@ class CustomSeekBar @JvmOverloads constructor(
 
     var position: Long
         get() = if (duration == -1L) -1L else (duration * thumbX.toDouble() / (layoutWidth - thumbWidth).toDouble()).toLong()
-        set(position) {
+        set(value) {
             if (duration <= 0) {
                 thumbX = 0
                 if (!isDragging) {
@@ -152,7 +153,8 @@ class CustomSeekBar @JvmOverloads constructor(
                 }
                 return
             }
-            thumbX = ceil(((layoutWidth - thumbWidth) * (position.toDouble() / duration))).toInt()
+            pendingPosition = value
+            thumbX = ceil(((layoutWidth - thumbWidth) * (value.toDouble() / duration))).toInt()
             if (thumbX < 0) {
                 thumbX = 0
             } else if (thumbX > layoutWidth - thumbWidth) {
@@ -174,6 +176,16 @@ class CustomSeekBar @JvmOverloads constructor(
 
     override fun draw(canvas: Canvas) {
         super.draw(canvas)
+        if (pendingPosition >= 0 && thumbX <= 0 && layoutWidth > 0) {
+            thumbX =
+                ceil(((layoutWidth - thumbWidth) * (pendingPosition.toDouble() / duration))).toInt()
+            if (thumbX < 0) {
+                thumbX = 0
+            } else if (thumbX > layoutWidth - thumbWidth) {
+                thumbX = layoutWidth - thumbWidth
+            }
+            pendingPosition = -1
+        }
         rect[(thumbWidth / 2).toFloat(), (layoutHeight / 2 - lineHeight / 2), (layoutWidth - thumbWidth / 2).toFloat()] =
             (layoutHeight / 2 + lineHeight / 2)
         paint.color = lineColor
@@ -308,8 +320,10 @@ class CustomSeekBar @JvmOverloads constructor(
                 Color.blue(cacheColor)
             )
         }
-        setDuration(20)
-        setBufferedPosition(18)
-        position = 10
+        if (isInEditMode) {
+            setDuration(20)
+            setBufferedPosition(18)
+            position = 8
+        }
     }
 }
diff --git a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/VideoControllerView.kt b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/VideoControllerView.kt
index e0ecb1107..21f535841 100644
--- a/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/VideoControllerView.kt
+++ b/app_filegallery/src/main/kotlin/dev/ragnarok/filegallery/view/VideoControllerView.kt
@@ -18,7 +18,7 @@ import dev.ragnarok.filegallery.R
 import dev.ragnarok.filegallery.view.media.MaterialPlayPauseFab
 import dev.ragnarok.filegallery.view.media.MediaActionDrawable
 import java.lang.ref.WeakReference
-import java.util.*
+import java.util.Locale
 
 class VideoControllerView : FrameLayout, CustomSeekBar.CustomSeekBarListener {
     private val mContext: Context
diff --git a/build.gradle b/build.gradle
index dd6f90e7d..a97354755 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,7 +13,7 @@ buildscript {
     ext.appFileGalleryVersionName = "1.999"
 
     //androidx libraries
-    ext.activityVersion = "1.7.0-beta02"
+    ext.activityVersion = "1.7.0-rc01"
     ext.annotationVersion = "1.6.0"
     ext.appcompatVersion = "1.6.1"
     ext.biometricVersion = "1.2.0-alpha05"
@@ -22,22 +22,22 @@ buildscript {
     ext.cardviewVersion = "1.0.0"
     ext.collectionVersion = "1.3.0-alpha02"
     ext.concurentVersion = "1.2.0-alpha01"
-    ext.constraintlayoutVersion = "2.2.0-alpha07"
+    ext.constraintlayoutVersion = "2.2.0-alpha08"
     ext.coordinatorlayoutVersion = "1.2.0"
-    ext.coreVersion = "1.10.0-beta01"
+    ext.coreVersion = "1.10.0-rc01"
     ext.customviewVersion = "1.2.0-alpha02"
     ext.customviewPoolingcontainerVersion = "1.0.0"
+    ext.drawerlayoutVersion = "1.2.0-rc01"
     ext.dynamicanimationVersion = "1.1.0-alpha03"
-    ext.drawerlayoutVersion = "1.2.0-beta01"
     ext.exifinterfaceVersion = "1.3.6"
-    ext.fragmentVersion = "1.6.0-alpha06"
-    ext.lifecycleVersion = "2.6.0-rc01"
+    ext.fragmentVersion = "1.6.0-alpha07"
+    ext.lifecycleVersion = "2.6.0"
     ext.loaderVersion = "1.1.0"
     ext.mediaVersion = "1.7.0-alpha01"
-    ext.recyclerviewVersion = "1.3.0-rc01"
+    ext.recyclerviewVersion = "1.3.0"
     ext.savedStateVersion = "1.2.0"
     ext.swiperefreshlayoutVersion = "1.2.0-alpha01"
-    ext.tracingVersion = "1.1.0"
+    ext.tracingVersion = "1.2.0-beta01"
     ext.transitionVersion = "1.4.1"
     ext.vectordrawableVersion = "1.2.0-beta01"
     ext.webkitVersion = "1.6.0"
@@ -45,10 +45,10 @@ buildscript {
 
     //firebase libraries
     ext.firebaseDatatransportVersion = "18.1.7"
-    ext.firebaseMessagingVersion = "23.1.1"
+    ext.firebaseMessagingVersion = "23.1.2"
 
     //firebase common libraries
-    ext.firebaseCommonVersion = "20.3.0"
+    ext.firebaseCommonVersion = "20.3.1"
     ext.firebaseInstallationsInteropVersion = "17.1.0"
     ext.firebaseComponentsVersion = "17.1.0"
     ext.firebaseAnnotationsVersion = "16.2.0"
@@ -56,15 +56,17 @@ buildscript {
     ext.autoValueVersion = "1.10.1"
 
     //common libraries
-    ext.kotlin_version = "1.8.20-Beta"
-    ext.kotlin_coroutines = "1.6.4"
+    ext.kotlin_version = "1.8.20-RC"
+    ext.kotlin_coroutines = "1.7.0-Beta"
     ext.kotlin_serializer = "1.5.0"
     ext.okhttpLibraryVersion = "5.0.0-alpha.11"
     ext.okioVersion = "3.3.0"
     ext.rxJavaVersion = "3.1.6"
     ext.guavaVersion = "31.1-android"
-    ext.exoLibraryVersion = "2.18.3"
+    ext.exoLibraryVersion = "2.18.4"
     ext.errorproneVersion = "2.15.0"
+    ext.checkerCompatQualVersion = "2.5.5"
+    ext.checkerQualAndroidVersion = "3.32.0"
     ext.desugarLibraryVersion = "2.0.2"
 
     //APP_PROPS
@@ -89,7 +91,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:8.0.0-beta04"
+        classpath "com.android.tools.build:gradle:8.0.0-beta05"
         classpath "com.google.gms:google-services:4.3.15"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
diff --git a/camera2/build.gradle b/camera2/build.gradle
index 4110b009f..86c567159 100644
--- a/camera2/build.gradle
+++ b/camera2/build.gradle
@@ -27,8 +27,8 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-parcelize-runtime:$kotlin_version")
     implementation("org.jetbrains.kotlin:kotlin-android-extensions-runtime:$kotlin_version")
     compileOnly("org.jetbrains.kotlin:kotlin-annotations-jvm:$kotlin_version")
-    compileOnly("org.checkerframework:checker-compat-qual:2.5.5")
-    compileOnly("org.checkerframework:checker-qual-android:3.31.0")
+    compileOnly("org.checkerframework:checker-compat-qual:$checkerCompatQualVersion")
+    compileOnly("org.checkerframework:checker-qual-android:$checkerQualAndroidVersion")
     compileOnly("com.google.auto.value:auto-value-annotations:$autoValueVersion")
     implementation("androidx.annotation:annotation:$annotationVersion")
     implementation("androidx.appcompat:appcompat:$appcompatVersion")
diff --git a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java
index 265856569..da0f2e6cd 100644
--- a/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java
+++ b/firebase-installations/src/main/java/com/google/firebase/installations/FirebaseInstallations.java
@@ -359,7 +359,7 @@ private synchronized String getCacheFid() {
      * @param forceRefresh true if this is for a getAuthToken call and if the caller wants to fetch a
      *                     new auth token from the server even if an unexpired auth token exists on the client.
      */
-    private final void doRegistrationOrRefresh(boolean forceRefresh) {
+    private void doRegistrationOrRefresh(boolean forceRefresh) {
 
         PersistedInstallationEntry prefs = getPrefsWithGeneratedIdMultiProcessSafe();
 
diff --git a/libfenrir/src/main/java/com/github/luben/zstd/EndDirective.java b/libfenrir/src/main/java/com/github/luben/zstd/EndDirective.java
index 84f6d6eb6..4fbb1c9b6 100644
--- a/libfenrir/src/main/java/com/github/luben/zstd/EndDirective.java
+++ b/libfenrir/src/main/java/com/github/luben/zstd/EndDirective.java
@@ -10,7 +10,7 @@ public enum EndDirective {
     END(2);
 
     private final int value;
-    private EndDirective(int value) {
+    EndDirective(int value) {
         this.value = value;
     }
 
diff --git a/libfenrir/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java b/libfenrir/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java
index 4477b4893..fbab8881f 100644
--- a/libfenrir/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java
+++ b/libfenrir/src/main/java/com/github/luben/zstd/ZstdCompressCtx.java
@@ -7,55 +7,58 @@ public class ZstdCompressCtx extends AutoCloseBase {
 
     private long nativePtr;
 
+    @SuppressWarnings("unused")
     private ZstdDictCompress compression_dict;
 
-    private native void init();
+    private static native long init();
 
-    private native void free();
+    private static native void free(long ptr);
 
     /**
      * Create a context for faster compress operations
      * One such context is required for each thread - put this in a ThreadLocal.
      */
     public ZstdCompressCtx() {
-        init();
+        nativePtr = init();
         if (0 == nativePtr) {
             throw new IllegalStateException("ZSTD_createCompressCtx failed");
         }
         storeFence();
     }
 
-    void  doClose() {
+    void doClose() {
         if (nativePtr != 0) {
-            free();
+            free(nativePtr);
             nativePtr = 0;
         }
     }
 
+    private void ensureOpen() {
+        if (nativePtr == 0) {
+            throw new IllegalStateException("Compression context is closed");
+        }
+    }
+
     /**
      * Set compression level
      * @param level compression level, default: {@link Zstd#defaultCompressionLevel()}
      */
     public ZstdCompressCtx setLevel(int level) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
-        setLevel0(level);
+        setLevel0(nativePtr, level);
         releaseSharedLock();
         return this;
     }
 
-    private native void setLevel0(int level);
+    private static native void setLevel0(long ptr, int level);
 
     /**
      * Enable or disable magicless frames
      * @param magiclessFlag A 32-bits magic number is written at start of frame, default: false
      */
     public ZstdCompressCtx setMagicless(boolean magiclessFlag) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
         Zstd.setCompressionMagicless(nativePtr, magiclessFlag);
         releaseSharedLock();
@@ -67,18 +70,17 @@ public ZstdCompressCtx setMagicless(boolean magiclessFlag) {
      * @param checksumFlag A 32-bits checksum of content is written at end of frame, default: false
      */
     public ZstdCompressCtx setChecksum(boolean checksumFlag) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
-        setChecksum0(checksumFlag);
+        setChecksum0(nativePtr, checksumFlag);
         releaseSharedLock();
         return this;
     }
-    private native void setChecksum0(boolean checksumFlag);
+    private static native void setChecksum0(long ptr, boolean checksumFlag);
 
 
     public ZstdCompressCtx setWorkers(int workers) {
+        ensureOpen();
         acquireSharedLock();
         Zstd.setCompressionWorkers(nativePtr, workers);
         releaseSharedLock();
@@ -90,30 +92,26 @@ public ZstdCompressCtx setWorkers(int workers) {
      * @param contentSizeFlag Content size will be written into frame header _whenever known_, default: true
      */
     public ZstdCompressCtx setContentSize(boolean contentSizeFlag) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
-        setContentSize0(contentSizeFlag);
+        setContentSize0(nativePtr, contentSizeFlag);
         releaseSharedLock();
         return this;
     }
-    private native void setContentSize0(boolean contentSizeFlag);
+    private static native void setContentSize0(long ptr, boolean contentSizeFlag);
 
     /**
      * Enable or disable dictID
      * @param dictIDFlag When applicable, dictionary's ID is written into frame header, default: true
      */
     public ZstdCompressCtx setDictID(boolean dictIDFlag) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
-        setDictID0(dictIDFlag);
+        setDictID0(nativePtr, dictIDFlag);
         releaseSharedLock();
         return this;
     }
-    private native void setDictID0(boolean dictIDFlag);
+    private static native void setDictID0(long ptr, boolean dictIDFlag);
 
     /**
      * Enable or disable LongDistanceMatching and set the window size
@@ -125,9 +123,7 @@ public ZstdCompressCtx setDictID(boolean dictIDFlag) {
      *                  0 disables LDM.
      */
     public ZstdCompressCtx setLong(int windowLog) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
         Zstd.setCompressionLong(nativePtr, windowLog);
         releaseSharedLock();
@@ -140,14 +136,11 @@ public ZstdCompressCtx setLong(int windowLog) {
      * @param dict the dictionary or `null` to remove loaded dictionary
      */
     public ZstdCompressCtx loadDict(ZstdDictCompress dict) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
-
+        ensureOpen();
         acquireSharedLock();
         dict.acquireSharedLock();
         try {
-            long result = loadCDictFast0(dict);
+            long result = loadCDictFast0(nativePtr, dict);
             if (Zstd.isError(result)) {
                 throw new ZstdException(result);
             }
@@ -159,7 +152,7 @@ public ZstdCompressCtx loadDict(ZstdDictCompress dict) {
         }
         return this;
     }
-    private native long loadCDictFast0(ZstdDictCompress dict);
+    private native long loadCDictFast0(long ptr, ZstdDictCompress dict);
 
     /**
      * Load compression dictionary to be used for subsequently compressed frames.
@@ -167,12 +160,10 @@ public ZstdCompressCtx loadDict(ZstdDictCompress dict) {
      * @param dict the dictionary or `null` to remove loaded dictionary
      */
     public ZstdCompressCtx loadDict(byte[] dict) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
         try {
-            long result = loadCDict0(dict);
+            long result = loadCDict0(nativePtr, dict);
             if (Zstd.isError(result)) {
                 throw new ZstdException(result);
             }
@@ -182,13 +173,7 @@ public ZstdCompressCtx loadDict(byte[] dict) {
         }
         return this;
     }
-    private native long loadCDict0(byte[] dict);
-
-    private void ensureOpen() {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
-    }
+    private native long loadCDict0(long ptr, byte[] dict);
 
     /**
      * Tells how much data has been ingested (read from input),
@@ -196,9 +181,9 @@ private void ensureOpen() {
      */
     public ZstdFrameProgression getFrameProgression() {
         ensureOpen();
-        return getFrameProgression0();
+        return getFrameProgression0(nativePtr);
     }
-    private native ZstdFrameProgression getFrameProgression0();
+    private static native ZstdFrameProgression getFrameProgression0(long ptr);
 
     /**
      * Clear all state and parameters from the compression context. This leaves the object in a
@@ -206,12 +191,12 @@ public ZstdFrameProgression getFrameProgression() {
      */
     public void reset() {
         ensureOpen();
-        long result = reset0();
+        long result = reset0(nativePtr);
         if (Zstd.isError(result)) {
             throw new ZstdException(result);
         }
     }
-    private native long reset0();
+    private static native long reset0(long ptr);
 
     /**
      * Promise to compress a certain number of source bytes. Knowing the number of bytes to compress
@@ -223,12 +208,12 @@ public void reset() {
      */
     public void setPledgedSrcSize(long srcSize) {
         ensureOpen();
-        long result = setPledgedSrcSize0(srcSize);
+        long result = setPledgedSrcSize0(nativePtr, srcSize);
         if (Zstd.isError(result)) {
             throw new ZstdException(result);
         }
     }
-    private native long setPledgedSrcSize0(long srcSize);
+    private static native long setPledgedSrcSize0(long ptr, long srcSize);
 
     /**
      * Compress as much of the <code>src</code> {@link ByteBuffer} into the <code>dst</code> {@link
@@ -241,7 +226,7 @@ public void setPledgedSrcSize(long srcSize) {
      */
     public boolean compressDirectByteBufferStream(ByteBuffer dst, ByteBuffer src, EndDirective endOp) {
         ensureOpen();
-        long result = compressDirectByteBufferStream0(dst, dst.position(), dst.limit(), src, src.position(), src.limit(), endOp.value());
+        long result = compressDirectByteBufferStream0(nativePtr, dst, dst.position(), dst.limit(), src, src.position(), src.limit(), endOp.value());
         if ((result & 0x80000000L) != 0) {
             long code = result & 0xFF;
             throw new ZstdException(code, Zstd.getErrorName(code));
@@ -258,7 +243,7 @@ public boolean compressDirectByteBufferStream(ByteBuffer dst, ByteBuffer src, En
      * bit is set if an error occurred. If an error occurred, the lowest 31 bits encode a zstd error
      * code. Otherwise, the lowest 31 bits are the new position of the source buffer.
      */
-    private native long compressDirectByteBufferStream0(ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcSize, int srcOffset, int endOp);
+    private static native long compressDirectByteBufferStream0(long ptr, ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcSize, int srcOffset, int endOp);
 
     /**
      * Compresses buffer 'srcBuff' into buffer 'dstBuff' reusing this ZstdCompressCtx.
@@ -277,9 +262,7 @@ public boolean compressDirectByteBufferStream(ByteBuffer dst, ByteBuffer src, En
      * @return  the number of bytes written into buffer 'dstBuff'.
      */
     public int compressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dstSize, ByteBuffer srcBuff, int srcOffset, int srcSize) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         if (!srcBuff.isDirect()) {
             throw new IllegalArgumentException("srcBuff must be a direct buffer");
         }
@@ -290,7 +273,7 @@ public int compressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dstSi
         acquireSharedLock();
 
         try {
-            long size = compressDirectByteBuffer0(dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
+            long size = compressDirectByteBuffer0(nativePtr, dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
             if (Zstd.isError(size)) {
                 throw new ZstdException(size);
             }
@@ -303,7 +286,7 @@ public int compressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dstSi
         }
     }
 
-    private native long compressDirectByteBuffer0(ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcOffset, int srcSize);
+    private static native long compressDirectByteBuffer0(long ptr, ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcOffset, int srcSize);
 
     /**
      * Compresses byte array 'srcBuff' into byte array 'dstBuff' reusing this ZstdCompressCtx.
@@ -321,14 +304,11 @@ public int compressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dstSi
      * @return  the number of bytes written into buffer 'dstBuff'.
      */
     public int compressByteArray(byte[] dstBuff, int dstOffset, int dstSize, byte[] srcBuff, int srcOffset, int srcSize) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
-
+        ensureOpen();
         acquireSharedLock();
 
         try {
-            long size = compressByteArray0(dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
+            long size = compressByteArray0(nativePtr, dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
             if (Zstd.isError(size)) {
                 throw new ZstdException(size);
             }
@@ -341,7 +321,7 @@ public int compressByteArray(byte[] dstBuff, int dstOffset, int dstSize, byte[]
         }
     }
 
-    private native long compressByteArray0(byte[] dst, int dstOffset, int dstSize, byte[] src, int srcOffset, int srcSize);
+    private static native long compressByteArray0(long ptr, byte[] dst, int dstOffset, int dstSize, byte[] src, int srcOffset, int srcSize);
 
     /* Convenience methods */
 
diff --git a/libfenrir/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java b/libfenrir/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java
index 5f1ac5894..7b27c9537 100644
--- a/libfenrir/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java
+++ b/libfenrir/src/main/java/com/github/luben/zstd/ZstdDecompressCtx.java
@@ -6,18 +6,19 @@
 public class ZstdDecompressCtx extends AutoCloseBase {
 
     private long nativePtr;
+    @SuppressWarnings("unused")
     private ZstdDictDecompress decompression_dict;
 
-    private native void init();
+    private static native long init();
 
-    private native void free();
+    private static native void free(long nativePtr);
 
     /**
      * Create a context for faster compress operations
      * One such context is required for each thread - put this in a ThreadLocal.
      */
     public ZstdDecompressCtx() {
-        init();
+        nativePtr = init();
         if (0 == nativePtr) {
             throw new IllegalStateException("ZSTD_createDeCompressCtx failed");
         }
@@ -26,7 +27,7 @@ public ZstdDecompressCtx() {
 
     void doClose() {
         if (nativePtr != 0) {
-            free();
+            free(nativePtr);
             nativePtr = 0;
         }
     }
@@ -36,9 +37,7 @@ void doClose() {
      * @param magiclessFlag A 32-bits checksum of content is written at end of frame, default: false
      */
     public ZstdDecompressCtx setMagicless(boolean magiclessFlag) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
         Zstd.setDecompressionMagicless(nativePtr, magiclessFlag);
         releaseSharedLock();
@@ -51,13 +50,11 @@ public ZstdDecompressCtx setMagicless(boolean magiclessFlag) {
      * @param dict the dictionary or `null` to remove loaded dictionary
      */
     public ZstdDecompressCtx loadDict(ZstdDictDecompress dict) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Decompression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
         dict.acquireSharedLock();
         try {
-            long result = loadDDictFast0(dict);
+            long result = loadDDictFast0(nativePtr, dict);
             if (Zstd.isError(result)) {
                 throw new ZstdException(result);
             }
@@ -69,7 +66,7 @@ public ZstdDecompressCtx loadDict(ZstdDictDecompress dict) {
         }
         return this;
     }
-    private native long loadDDictFast0(ZstdDictDecompress dict);
+    private static native long loadDDictFast0(long nativePtr, ZstdDictDecompress dict);
 
     /**
      * Load decompression dictionary.
@@ -77,12 +74,10 @@ public ZstdDecompressCtx loadDict(ZstdDictDecompress dict) {
      * @param dict the dictionary or `null` to remove loaded dictionary
      */
     public ZstdDecompressCtx loadDict(byte[] dict) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Compression context is closed");
-        }
+        ensureOpen();
         acquireSharedLock();
         try {
-            long result = loadDDict0(dict);
+            long result = loadDDict0(nativePtr, dict);
             if (Zstd.isError(result)) {
                 throw new ZstdException(result);
             }
@@ -92,7 +87,7 @@ public ZstdDecompressCtx loadDict(byte[] dict) {
         }
         return this;
     }
-    private native long loadDDict0(byte[] dict);
+    private static native long loadDDict0(long nativePtr, byte[] dict);
 
     /**
      * Clear all state and parameters from the decompression context. This leaves the object in a
@@ -100,9 +95,9 @@ public ZstdDecompressCtx loadDict(byte[] dict) {
      */
     public void reset() {
         ensureOpen();
-        reset0();
+        reset0(nativePtr);
     }
-    private native void reset0();
+    private static native void reset0(long nativePtr);
 
     private void ensureOpen() {
         if (nativePtr == 0) {
@@ -120,7 +115,7 @@ private void ensureOpen() {
      */
     public boolean decompressDirectByteBufferStream(ByteBuffer dst, ByteBuffer src) {
         ensureOpen();
-        long result = decompressDirectByteBufferStream0(dst, dst.position(), dst.limit(), src, src.position(), src.limit());
+        long result = decompressDirectByteBufferStream0(nativePtr, dst, dst.position(), dst.limit(), src, src.position(), src.limit());
         if ((result & 0x80000000L) != 0) {
             long code = result & 0xFF;
             throw new ZstdException(code, Zstd.getErrorName(code));
@@ -137,7 +132,7 @@ public boolean decompressDirectByteBufferStream(ByteBuffer dst, ByteBuffer src)
      * bit is set if an error occurred. If an error occurred, the lowest 31 bits encode a zstd error
      * code. Otherwise, the lowest 31 bits are the new position of the source buffer.
      */
-    private native long decompressDirectByteBufferStream0(ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcOffset, int srcSize);
+    private static native long decompressDirectByteBufferStream0(long nativePtr, ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcOffset, int srcSize);
 
     /**
      * Decompresses buffer 'srcBuff' into buffer 'dstBuff' using this ZstdDecompressCtx.
@@ -155,9 +150,7 @@ public boolean decompressDirectByteBufferStream(ByteBuffer dst, ByteBuffer src)
      * @return the number of bytes decompressed into destination buffer (originalSize)
      */
     public int decompressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dstSize, ByteBuffer srcBuff, int srcOffset, int srcSize) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Decompression context is closed");
-        }
+        ensureOpen();
         if (!srcBuff.isDirect()) {
             throw new IllegalArgumentException("srcBuff must be a direct buffer");
         }
@@ -168,7 +161,7 @@ public int decompressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dst
         acquireSharedLock();
 
         try {
-            long size = decompressDirectByteBuffer0(dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
+            long size = decompressDirectByteBuffer0(nativePtr, dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
             if (Zstd.isError(size)) {
                 throw new ZstdException(size);
             }
@@ -181,7 +174,7 @@ public int decompressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dst
         }
     }
 
-    private native long decompressDirectByteBuffer0(ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcOffset, int srcSize);
+    private static native long decompressDirectByteBuffer0(long nativePtr, ByteBuffer dst, int dstOffset, int dstSize, ByteBuffer src, int srcOffset, int srcSize);
 
     /**
      * Decompresses byte array 'srcBuff' into byte array 'dstBuff' using this ZstdDecompressCtx.
@@ -197,14 +190,11 @@ public int decompressDirectByteBuffer(ByteBuffer dstBuff, int dstOffset, int dst
      * @return the number of bytes decompressed into destination buffer (originalSize)
      */
     public int decompressByteArray(byte[] dstBuff, int dstOffset, int dstSize, byte[] srcBuff, int srcOffset, int srcSize) {
-        if (nativePtr == 0) {
-            throw new IllegalStateException("Decompression context is closed");
-        }
-
+        ensureOpen();
         acquireSharedLock();
 
         try {
-            long size = decompressByteArray0(dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
+            long size = decompressByteArray0(nativePtr, dstBuff, dstOffset, dstSize, srcBuff, srcOffset, srcSize);
             if (Zstd.isError(size)) {
                 throw new ZstdException(size);
             }
@@ -217,7 +207,7 @@ public int decompressByteArray(byte[] dstBuff, int dstOffset, int dstSize, byte[
         }
     }
 
-    private native long decompressByteArray0(byte[] dst, int dstOffset, int dstSize, byte[] src, int srcOffset, int srcSize);
+    private static native long decompressByteArray0(long nativePtr, byte[] dst, int dstOffset, int dstSize, byte[] src, int srcOffset, int srcSize);
 
     /* Covenience methods */
 
@@ -276,6 +266,9 @@ public int decompress(byte[] dst, byte[] src) {
     * @return byte array with the decompressed data
     */
     public byte[] decompress(byte[] src, int originalSize) throws ZstdException {
+        if (originalSize < 0) {
+            throw new ZstdException(Zstd.errGeneric(), "Original size should not be negative");
+        }
         byte[] dst = new byte[originalSize];
         int size = decompress(dst, src);
         if (size != originalSize) {
diff --git a/libfenrir/src/main/java/com/github/luben/zstd/ZstdDirectBufferCompressingStreamNoFinalizer.java b/libfenrir/src/main/java/com/github/luben/zstd/ZstdDirectBufferCompressingStreamNoFinalizer.java
index a8e975e16..78c36908b 100644
--- a/libfenrir/src/main/java/com/github/luben/zstd/ZstdDirectBufferCompressingStreamNoFinalizer.java
+++ b/libfenrir/src/main/java/com/github/luben/zstd/ZstdDirectBufferCompressingStreamNoFinalizer.java
@@ -30,9 +30,9 @@ public ZstdDirectBufferCompressingStreamNoFinalizer(ByteBuffer target, int level
 
     public static int recommendedOutputBufferSize() { return (int)recommendedCOutSize(); }
 
-    @SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal"})
+    @SuppressWarnings({"FieldCanBeLocal", "FieldMayBeFinal", "unused"})
     private int consumed;
-    @SuppressWarnings("FieldMayBeFinal")
+    @SuppressWarnings({"FieldMayBeFinal", "unused"})
     private int produced;
     private boolean closed;
     private boolean initialized;
diff --git a/libfenrir/src/main/java/com/github/luben/zstd/ZstdOutputStreamNoFinalizer.java b/libfenrir/src/main/java/com/github/luben/zstd/ZstdOutputStreamNoFinalizer.java
index d91b57367..23442c6f5 100644
--- a/libfenrir/src/main/java/com/github/luben/zstd/ZstdOutputStreamNoFinalizer.java
+++ b/libfenrir/src/main/java/com/github/luben/zstd/ZstdOutputStreamNoFinalizer.java
@@ -16,7 +16,7 @@ public class ZstdOutputStreamNoFinalizer extends FilterOutputStream {
     // Source and Destination positions
     @SuppressWarnings("FieldCanBeLocal")
     private long srcPos;
-    @SuppressWarnings("FieldMayBeFinal")
+    @SuppressWarnings({"FieldMayBeFinal", "unused"})
     private long dstPos;
     private final BufferPool bufferPool;
     private final ByteBuffer dstByteBuffer;
@@ -25,6 +25,7 @@ public class ZstdOutputStreamNoFinalizer extends FilterOutputStream {
     private static final int dstSize = (int) recommendedCOutSize();
     private boolean closeFrameOnFlush;
     private boolean frameClosed = true;
+    private boolean frameStarted;
 
     /* JNI methods */
     public static native long recommendedCOutSize();
@@ -194,6 +195,7 @@ public synchronized void write(byte[] src, int offset, int len) throws IOExcepti
                 throw new ZstdIOException(size);
             }
             frameClosed = false;
+            frameStarted = true;
         }
         int srcSize = offset + len;
         srcPos = offset;
@@ -263,9 +265,19 @@ private void close(boolean closeParentStream) throws IOException {
             return;
         }
         try {
+            int size;
+            // Closing the stream withouth before writing anything
+            // should still produce valid zstd frame. So reset the
+            // stream to start a frame if no frame was ever started.
+            if (!frameStarted) {
+                size = resetCStream(stream);
+                if (Zstd.isError(size)) {
+                    throw new ZstdIOException(size);
+                }
+                frameClosed = false;
+            }
+            // compress the remaining input and close the frame
             if (!frameClosed) {
-                // compress the remaining input and close the frame
-                int size;
                 do {
                     size = endStream(stream, dst, dstSize);
                     if (Zstd.isError(size)) {
@@ -275,7 +287,7 @@ private void close(boolean closeParentStream) throws IOException {
                 } while (size > 0);
             }
             if (closeParentStream) {
-                    out.close();
+                out.close();
             }
         } finally {
             // release the resources even if underlying stream throw an exception
diff --git a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/rotate_row.h b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/rotate_row.h
index d047b703e..2dd8c03d3 100644
--- a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/rotate_row.h
+++ b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/rotate_row.h
@@ -56,10 +56,6 @@ extern "C" {
     (defined(__ARM_NEON__) || defined(LIBYUV_NEON) || defined(__aarch64__))
 #define HAS_TRANSPOSEWX8_NEON
 #define HAS_TRANSPOSEUVWX8_NEON
-#endif
-
-#if !defined(LIBYUV_DISABLE_NEON) && \
-    (defined(LIBYUV_NEON) || defined(__aarch64__))
 #define HAS_TRANSPOSE4X4_32_NEON
 #endif
 
diff --git a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h
index cc1e66e71..e3905b460 100644
--- a/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h
+++ b/libfenrir/src/main/jni/animation/libyuv/include/libyuv/version.h
@@ -11,6 +11,6 @@
 #ifndef INCLUDE_LIBYUV_VERSION_H_
 #define INCLUDE_LIBYUV_VERSION_H_
 
-#define LIBYUV_VERSION 1862
+#define LIBYUV_VERSION 1863
 
 #endif  // INCLUDE_LIBYUV_VERSION_H_
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/convert.cc b/libfenrir/src/main/jni/animation/libyuv/source/convert.cc
index 37b7091b1..0bcfbf20b 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/convert.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/convert.cc
@@ -801,10 +801,9 @@ int MT2TToP010(const uint8_t* src_y,
   }
 
   {
-    int u_width = (width + 1) / 2;
-    int uv_width = 2 * u_width;
+    int uv_width = (width + 1) & ~1;
+    int uv_height = (height + 1) / 2;
     int y = 0;
-    int uv_height = uv_height = (height + 1) / 2;
     const int tile_width = 16;
     const int y_tile_height = 32;
     const int uv_tile_height = 16;
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/rotate_neon.cc b/libfenrir/src/main/jni/animation/libyuv/source/rotate_neon.cc
index 844df2bf3..569a7318f 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/rotate_neon.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/rotate_neon.cc
@@ -410,6 +410,46 @@ void TransposeUVWx8_NEON(const uint8_t* src,
       : "r"(&kVTbl4x4TransposeDi)  // %8
       : "memory", "cc", "q0", "q1", "q2", "q3", "q8", "q9", "q10", "q11");
 }
+
+// Transpose 32 bit values (ARGB)
+void Transpose4x4_32_NEON(const uint8_t* src,
+                          int src_stride,
+                          uint8_t* dst,
+                          int dst_stride,
+                          int width) {
+  const uint8_t* src1 = src + src_stride;
+  const uint8_t* src2 = src1 + src_stride;
+  const uint8_t* src3 = src2 + src_stride;
+  uint8_t* dst1 = dst + dst_stride;
+  uint8_t* dst2 = dst1 + dst_stride;
+  uint8_t* dst3 = dst2 + dst_stride;
+  asm volatile(
+      // Main loop transpose 4x4.  Read a column, write a row.
+      "1:                                        \n"
+      "vld4.32     {d0[0], d2[0], d4[0], d6[0]}, [%0], %9 \n"
+      "vld4.32     {d0[1], d2[1], d4[1], d6[1]}, [%1], %9 \n"
+      "vld4.32     {d1[0], d3[0], d5[0], d7[0]}, [%2], %9 \n"
+      "vld4.32     {d1[1], d3[1], d5[1], d7[1]}, [%3], %9 \n"
+      "subs        %8, %8, #4                    \n"  // w -= 4
+      "vst1.8      {q0}, [%4]!                   \n"
+      "vst1.8      {q1}, [%5]!                   \n"
+      "vst1.8      {q2}, [%6]!                   \n"
+      "vst1.8      {q3}, [%7]!                   \n"
+      "bgt         1b                            \n"
+
+      : "+r"(src),                        // %0
+        "+r"(src1),                       // %1
+        "+r"(src2),                       // %2
+        "+r"(src3),                       // %3
+        "+r"(dst),                        // %4
+        "+r"(dst1),                       // %5
+        "+r"(dst2),                       // %6
+        "+r"(dst3),                       // %7
+        "+r"(width)                       // %8
+      : "r"((ptrdiff_t)(src_stride * 4))  // %9
+      : "memory", "cc", "q0", "q1", "q2", "q3");
+}
+
 #endif  // defined(__ARM_NEON__) && !defined(__aarch64__)
 
 #ifdef __cplusplus
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/row_common.cc b/libfenrir/src/main/jni/animation/libyuv/source/row_common.cc
index 84afd35ba..afccdb8d6 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/row_common.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/row_common.cc
@@ -2868,24 +2868,21 @@ void DetileToYUY2_C(const uint8_t* src_y,
 // Unpack MT2T into tiled P010 64 pixels at a time. MT2T's bitstream is encoded
 // in 80 byte blocks representing 64 pixels each. The first 16 bytes of the
 // block contain all of the lower 2 bits of each pixel packed together, and the
-// next 64 bytes represent all the upper 8 bits of the pixel.
+// next 64 bytes represent all the upper 8 bits of the pixel. The lower bits are
+// packed into 1x4 blocks, whereas the upper bits are packed in normal raster
+// order.
 void UnpackMT2T_C(const uint8_t* src, uint16_t* dst, size_t size) {
   for (size_t i = 0; i < size; i += 80) {
     const uint8_t* src_lower_bits = src;
     const uint8_t* src_upper_bits = src + 16;
 
-    for (int j = 0; j < 16; j++) {
-      uint8_t lower_bits = src_lower_bits[j];
-      *dst++ = (lower_bits & 0x03) << 6 | (uint16_t)src_upper_bits[j * 4] << 8 |
-               (uint16_t)src_upper_bits[j * 4] >> 2;
-      *dst++ = (lower_bits & 0x0C) << 4 |
-               (uint16_t)src_upper_bits[j * 4 + 1] << 8 |
-               (uint16_t)src_upper_bits[j * 4 + 1] >> 2;
-      *dst++ = (lower_bits & 0x30) << 2 |
-               (uint16_t)src_upper_bits[j * 4 + 2] << 8 |
-               (uint16_t)src_upper_bits[j * 4 + 2] >> 2;
-      *dst++ = (lower_bits & 0xC0) | (uint16_t)src_upper_bits[j * 4 + 3] << 8 |
-               (uint16_t)src_upper_bits[j * 4 + 3] >> 2;
+    for (int j = 0; j < 4; j++) {
+      for (int k = 0; k < 16; k++) {
+        *dst++ = ((src_lower_bits[k] >> (j * 2)) & 0x3) << 6 |
+                 (uint16_t)*src_upper_bits << 8 |
+                 (uint16_t)*src_upper_bits >> 2;
+        src_upper_bits++;
+      }
     }
 
     src += 80;
@@ -4547,4 +4544,4 @@ void HalfMergeUVRow_C(const uint8_t* src_u,
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
-#endif
\ No newline at end of file
+#endif
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/row_neon.cc b/libfenrir/src/main/jni/animation/libyuv/source/row_neon.cc
index 37f6db0cd..b3e800d91 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/row_neon.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/row_neon.cc
@@ -721,57 +721,43 @@ void DetileToYUY2_NEON(const uint8_t* src_y,
 #endif
 
 void UnpackMT2T_NEON(const uint8_t* src, uint16_t* dst, size_t size) {
-  const uint8_t* src_lower_bits = src;
-  const uint8_t* src_upper_bits = src + 16;
-  asm volatile(
-      "1:                                        \n"
-      "vld4.8      {d1, d3, d5, d7}, [%1]!       \n"  // Load 32 bytes of upper
-                                                      // bits.
-      "vld1.8      {d6}, [%0]!                   \n"  // Load 8 bytes of lower
-                                                      // bits.
-      "vshl.u8     d4, d6, #2                    \n"  // Align lower bits.
-      "vshl.u8     d2, d6, #4                    \n"
-      "vshl.u8     d0, d6, #6                    \n"
-      "vzip.u8     d0, d1                        \n"  // Zip lower and upper
-                                                      // bits together.
-      "vzip.u8     d2, d3                        \n"
-      "vzip.u8     d4, d5                        \n"
-      "vzip.u8     d6, d7                        \n"
-      "vsri.u16    q0, q0, #10                   \n"  // Copy upper 6 bits into
-                                                      // lower 6 bits for better
-                                                      // accuracy in
-                                                      // conversions.
-      "vsri.u16    q1, q1, #10                   \n"
-      "vsri.u16    q2, q2, #10                   \n"
-      "vsri.u16    q3, q3, #10                   \n"
-      "vst4.16     {d0, d2, d4, d6}, [%2]!       \n"  // Store 32 pixels
-      "vst4.16     {d1, d3, d5, d7}, [%2]!       \n"
-      "vld4.8      {d1, d3, d5, d7}, [%1]!       \n"  // Process last 32 pixels
-                                                      // in the block
-      "vld1.8      {d6}, [%0]!                   \n"
-      "vshl.u8     d4, d6, #2                    \n"
-      "vshl.u8     d2, d6, #4                    \n"
-      "vshl.u8     d0, d6, #6                    \n"
-      "vzip.u8     d0, d1                        \n"
-      "vzip.u8     d2, d3                        \n"
-      "vzip.u8     d4, d5                        \n"
-      "vzip.u8     d6, d7                        \n"
-      "vsri.u16    q0, q0, #10                   \n"
-      "vsri.u16    q1, q1, #10                   \n"
-      "vsri.u16    q2, q2, #10                   \n"
-      "vsri.u16    q3, q3, #10                   \n"
-      "vst4.16     {d0, d2, d4, d6}, [%2]!       \n"
-      "vst4.16     {d1, d3, d5, d7}, [%2]!       \n"
-      "mov         %0, %1                        \n"
-      "add         %1, %0, #16                   \n"
-      "subs        %3, %3, #80                   \n"
-      "bgt         1b                            \n"
-      : "+r"(src_lower_bits),  // %0
-        "+r"(src_upper_bits),  // %1
-        "+r"(dst),             // %2
-        "+r"(size)             // %3
+  asm volatile(
+      "1:                                        \n"
+      "vld1.8      q14, [%0]!                    \n"  // Load lower bits.
+      "vld1.8      q9, [%0]!                     \n"  // Load upper bits row
+                                                        // by row.
+      "vld1.8      q11, [%0]!                    \n"
+      "vld1.8      q13, [%0]!                    \n"
+      "vld1.8      q15, [%0]!                    \n"
+      "vshl.u8     q8, q14, #6                   \n"  // Shift lower bit data
+                                                        // appropriately.
+      "vshl.u8     q10, q14, #4                  \n"
+      "vshl.u8     q12, q14, #2                  \n"
+      "vzip.u8     q8, q9                        \n"  // Interleave upper and
+                                                        // lower bits.
+      "vzip.u8     q10, q11                      \n"
+      "vzip.u8     q12, q13                      \n"
+      "vzip.u8     q14, q15                      \n"
+      "vsri.u16    q8, q8, #10                   \n"  // Copy upper 6 bits
+                                                        // into lower 6 bits for
+                                                        // better accuracy in
+                                                        // conversions.
+      "vsri.u16    q9, q9, #10                   \n"
+      "vsri.u16    q10, q10, #10                 \n"
+      "vsri.u16    q11, q11, #10                 \n"
+      "vsri.u16    q12, q12, #10                 \n"
+      "vsri.u16    q13, q13, #10                 \n"
+      "vsri.u16    q14, q14, #10                 \n"
+      "vsri.u16    q15, q15, #10                 \n"
+      "vstmia      %1!, {q8-q15}                 \n"  // Store pixel block (64
+                                                        // pixels).
+      "subs        %2, %2, #80                   \n"
+      "bgt         1b                            \n"
+      : "+r"(src),  // %0
+        "+r"(dst),  // %1
+        "+r"(size)  // %2
       :
-      : "cc", "memory", "q0", "q1", "q2", "q3");
+      : "cc", "memory", "q8", "q9", "q10", "q11", "q12", "q13", "q14", "q15");
 }
 
 // Reads 16 U's and V's and writes out 16 pairs of UV.
diff --git a/libfenrir/src/main/jni/animation/libyuv/source/row_neon64.cc b/libfenrir/src/main/jni/animation/libyuv/source/row_neon64.cc
index 7f04b6068..2b5522f03 100644
--- a/libfenrir/src/main/jni/animation/libyuv/source/row_neon64.cc
+++ b/libfenrir/src/main/jni/animation/libyuv/source/row_neon64.cc
@@ -752,49 +752,39 @@ void DetileToYUY2_NEON(const uint8_t* src_y,
 // Unpack MT2T into tiled P010 64 pixels at a time. See
 // tinyurl.com/mtk-10bit-video-format for format documentation.
 void UnpackMT2T_NEON(const uint8_t* src, uint16_t* dst, size_t size) {
-  const uint8_t* src_lower_bits = src;
-  const uint8_t* src_upper_bits = src + 16;
   asm volatile(
       "1:                                        \n"
-      "ld4         {v0.8b, v1.8b, v2.8b, v3.8b}, [%1], #32 \n"
-      "ld1         {v7.8b}, [%0], #8             \n"
-      "shl         v6.8b, v7.8b, #2              \n"
-      "shl         v5.8b, v7.8b, #4              \n"
-      "shl         v4.8b, v7.8b, #6              \n"
-      "zip1        v0.16b, v4.16b, v0.16b        \n"
-      "zip1        v1.16b, v5.16b, v1.16b        \n"
-      "zip1        v2.16b, v6.16b, v2.16b        \n"
-      "zip1        v3.16b, v7.16b, v3.16b        \n"
-      "sri         v0.8h, v0.8h, #10             \n"
-      "sri         v1.8h, v1.8h, #10             \n"
-      "sri         v2.8h, v2.8h, #10             \n"
-      "sri         v3.8h, v3.8h, #10             \n"
-      "st4         {v0.8h, v1.8h, v2.8h, v3.8h}, [%2], #64 \n"
-      "ld4         {v0.8b, v1.8b, v2.8b, v3.8b}, [%1], #32 \n"
-      "ld1         {v7.8b}, [%0], #8             \n"
-      "shl         v6.8b, v7.8b, #2              \n"
-      "shl         v5.8b, v7.8b, #4              \n"
-      "shl         v4.8b, v7.8b, #6              \n"
-      "zip1        v0.16b, v4.16b, v0.16b        \n"
-      "zip1        v1.16b, v5.16b, v1.16b        \n"
-      "zip1        v2.16b, v6.16b, v2.16b        \n"
-      "zip1        v3.16b, v7.16b, v3.16b        \n"
-      "sri         v0.8h, v0.8h, #10             \n"
-      "sri         v1.8h, v1.8h, #10             \n"
-      "sri         v2.8h, v2.8h, #10             \n"
-      "sri         v3.8h, v3.8h, #10             \n"
-      "st4         {v0.8h, v1.8h, v2.8h, v3.8h}, [%2], #64 \n"
-      "mov         %0, %1                        \n"
-      "add         %1, %0, #16                   \n"
-      "subs        %3, %3, #80                   \n"
-      "b.gt        1b                            \n"
-      : "+r"(src_lower_bits),  // %0
-        "+r"(src_upper_bits),  // %1
-        "+r"(dst),             // %2
-        "+r"(size)             // %3
+      "ld1         {v7.16b}, [%0], #16           \n"
+      "ld1         {v0.16b-v3.16b}, [%0], #64    \n"
+      "shl         v4.16b, v7.16b, #6            \n"
+      "shl         v5.16b, v7.16b, #4            \n"
+      "shl         v6.16b, v7.16b, #2            \n"
+      "subs        %2, %2, #80                   \n"
+      "zip1        v16.16b, v4.16b, v0.16b       \n"
+      "zip1        v18.16b, v5.16b, v1.16b       \n"
+      "zip1        v20.16b, v6.16b, v2.16b       \n"
+      "zip1        v22.16b, v7.16b, v3.16b       \n"
+      "zip2        v17.16b, v4.16b, v0.16b       \n"
+      "zip2        v19.16b, v5.16b, v1.16b       \n"
+      "zip2        v21.16b, v6.16b, v2.16b       \n"
+      "zip2        v23.16b, v7.16b, v3.16b       \n"
+      "sri         v16.8h, v16.8h, #10           \n"
+      "sri         v17.8h, v17.8h, #10           \n"
+      "sri         v18.8h, v18.8h, #10           \n"
+      "sri         v19.8h, v19.8h, #10           \n"
+      "st1         {v16.8h-v19.8h}, [%1], #64    \n"
+      "sri         v20.8h, v20.8h, #10           \n"
+      "sri         v21.8h, v21.8h, #10           \n"
+      "sri         v22.8h, v22.8h, #10           \n"
+      "sri         v23.8h, v23.8h, #10           \n"
+      "st1         {v20.8h-v23.8h}, [%1], #64    \n"
+      "b.gt        1b                            \n"
+      : "+r"(src),  // %0
+        "+r"(dst),  // %1
+        "+r"(size)  // %2
       :
       : "cc", "memory", "w0", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7",
-        "v8", "v9", "v10", "v11", "v12");
+        "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23");
 }
 
 #if LIBYUV_USE_ST2
diff --git a/libfenrir/src/main/jni/compress/zstd/jni_fast_zstd.c b/libfenrir/src/main/jni/compress/zstd/jni_fast_zstd.c
index 805b24964..69d301a65 100644
--- a/libfenrir/src/main/jni/compress/zstd/jni_fast_zstd.c
+++ b/libfenrir/src/main/jni/compress/zstd/jni_fast_zstd.c
@@ -9,9 +9,6 @@
 // They can't change in the same VM
 static jfieldID compress_dict = 0;
 static jfieldID decompress_dict = 0;
-static jfieldID compress_ctx_nativePtr = 0;
-static jfieldID decompress_ctx_nativePtr = 0;
-
 
 /*
  * Class:     com_github_luben_zstd_ZstdDictCompress
@@ -204,94 +201,84 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_Zstd_decompressDirectByteBuff
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    init
- * Signature: ()V
+ * Signature: ()J
  */
-JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_init
-  (JNIEnv *env, jobject obj)
+JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_init
+  (JNIEnv *env, jclass clazz)
 {
-    if (compress_ctx_nativePtr == 0) {
-        jclass clazz = (*env)->GetObjectClass(env, obj);
-        compress_ctx_nativePtr = (*env)->GetFieldID(env, clazz, "nativePtr", "J");
-    }
     ZSTD_CCtx* cctx = ZSTD_createCCtx();
-    (*env)->SetLongField(env, obj, compress_ctx_nativePtr, (jlong)(intptr_t) cctx);
+    return (jlong)(intptr_t) cctx;
 }
 
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    free
- * Signature: ()V
+ * Signature: (J)V
  */
 JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_free
-  (JNIEnv *env, jobject obj)
+  (JNIEnv *env, jclass clazz, jlong ptr)
 {
-    if (compress_ctx_nativePtr == 0) return;
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, obj, compress_ctx_nativePtr);
-    if (NULL == cctx) return;
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     ZSTD_freeCCtx(cctx);
 }
 
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    setLevel0
- * Signature: (I)V
+ * Signature: (JI)V
  */
 JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_setLevel0
-  (JNIEnv *env, jobject obj, jint level)
+  (JNIEnv *env, jclass clazz, jlong ptr, jint level)
 {
-    if (compress_ctx_nativePtr == 0) return;
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, obj, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     ZSTD_CCtx_setParameter(cctx, ZSTD_c_compressionLevel, level);
 }
 
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    setChecksum0
- * Signature: (I)V
+ * Signature: (JI)V
  */
 JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_setChecksum0
-  (JNIEnv *env, jobject obj, jboolean checksumFlag)
+  (JNIEnv *env, jclass clazz, jlong ptr, jboolean checksumFlag)
 {
-    if (compress_ctx_nativePtr == 0) return;
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, obj, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     ZSTD_CCtx_setParameter(cctx, ZSTD_c_checksumFlag, (checksumFlag == JNI_TRUE));
 }
 
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    setContentSize0
- * Signature: (I)V
+ * Signature: (JI)V
  */
 JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_setContentSize0
-  (JNIEnv *env, jobject obj, jboolean contentSizeFlag)
+  (JNIEnv *env, jclass clazz, jlong ptr, jboolean contentSizeFlag)
 {
-    if (compress_ctx_nativePtr == 0) return;
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, obj, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     ZSTD_CCtx_setParameter(cctx, ZSTD_c_contentSizeFlag, (contentSizeFlag == JNI_TRUE));
 }
 
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    setDictID0
- * Signature: (I)V
+ * Signature: (JI)V
  */
 JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_setDictID0
-  (JNIEnv *env, jobject obj, jboolean dictIDFlag)
+  (JNIEnv *env, jclass clazz, jlong ptr, jboolean dictIDFlag)
 {
-    if (compress_ctx_nativePtr == 0) return;
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, obj, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     ZSTD_CCtx_setParameter(cctx, ZSTD_c_dictIDFlag, (dictIDFlag == JNI_TRUE));
 }
 
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    loadCDictFast0
- * Signature: (Lcom/github/luben/zstd/ZstdDictCompress)J
+ * Signature: (JLcom/github/luben/zstd/ZstdDictCompress)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_loadCDictFast0
-  (JNIEnv *env, jobject obj, jobject dict)
+  (JNIEnv *env, jclass clazz, jlong ptr, jobject dict)
 {
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, obj, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     if (dict == NULL) {
         // remove dictionary
         return ZSTD_CCtx_refCDict(cctx, NULL);
@@ -304,12 +291,12 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_loadCDictFast
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    loadCDict0
- * Signature: ([B)J
+ * Signature: (J[B)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_loadCDict0
-  (JNIEnv *env, jobject obj, jbyteArray dict)
+  (JNIEnv *env, jclass clazz, jlong ptr, jbyteArray dict)
 {
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, obj, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     if (dict == NULL) {
         // remove dictionary
         return ZSTD_CCtx_loadDictionary(cctx, NULL, 0);
@@ -325,19 +312,19 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_loadCDict0
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    reset0
- * Signature: (L)J
+ * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_reset0
-  (JNIEnv *env, jclass jctx) {
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, jctx, compress_ctx_nativePtr);
+  (JNIEnv *env, jclass jctx, jlong ptr) {
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     return ZSTD_CCtx_reset(cctx, ZSTD_reset_session_and_parameters);
 }
 
 JNIEXPORT jobject JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_getFrameProgression0
-  (JNIEnv *env, jclass jctx) {
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, jctx, compress_ctx_nativePtr);
+  (JNIEnv *env, jclass jctx, jlong ptr) {
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     ZSTD_frameProgression native_progression = ZSTD_getFrameProgression(cctx);
-    
+
     jclass frame_progression_class = (*env)->FindClass(env, "com/github/luben/zstd/ZstdFrameProgression");
     jmethodID frame_progression_constructor = (*env)->GetMethodID(env, frame_progression_class, "<init>", "(JJJJII)V");
     return (*env)->NewObject(
@@ -347,16 +334,16 @@ JNIEXPORT jobject JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_getFramePro
 }
 
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_setPledgedSrcSize0
-  (JNIEnv *env, jclass jctx, jlong src_size) {
+  (JNIEnv *env, jclass jctx, jlong ptr, jlong src_size) {
     if (src_size < 0) {
         return -ZSTD_error_srcSize_wrong;
     }
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, jctx, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
     return ZSTD_CCtx_setPledgedSrcSize(cctx, (unsigned long long)src_size);
 }
 
 static size_t compress_direct_buffer_stream
-  (JNIEnv *env, jclass jctx, jobject dst, jint *dst_offset, jint dst_size, jobject src, jint *src_offset, jint src_size, jint end_op) {
+  (JNIEnv *env, jclass jctx, jlong ptr, jobject dst, jint *dst_offset, jint dst_size, jobject src, jint *src_offset, jint src_size, jint end_op) {
     if (NULL == dst) return -ZSTD_error_dstSize_tooSmall;
     if (NULL == src) return -ZSTD_error_srcSize_wrong;
     if (0 > *dst_offset) return -ZSTD_error_dstSize_tooSmall;
@@ -367,7 +354,7 @@ static size_t compress_direct_buffer_stream
     if (dst_size > dst_cap) return -ZSTD_error_dstSize_tooSmall;
     jsize src_cap = (*env)->GetDirectBufferCapacity(env, src);
     if (src_size > src_cap) return -ZSTD_error_srcSize_wrong;
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, jctx, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
 
     ZSTD_outBuffer out;
     out.pos = *dst_offset;
@@ -389,11 +376,11 @@ static size_t compress_direct_buffer_stream
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    compressDirectByteBufferStream0
- * Signature: (Ljava/nio/ByteBuffer;IILjava/nio/ByteBuffer;III)J
+ * Signature: (JLjava/nio/ByteBuffer;IILjava/nio/ByteBuffer;III)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_compressDirectByteBufferStream0
-  (JNIEnv *env, jclass jctx, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size, jint end_op) {
-    size_t result = compress_direct_buffer_stream(env, jctx, dst, &dst_offset, dst_size, src, &src_offset, src_size, end_op);
+  (JNIEnv *env, jclass jctx, jlong ptr, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size, jint end_op) {
+    size_t result = compress_direct_buffer_stream(env, jctx, ptr, dst, &dst_offset, dst_size, src, &src_offset, src_size, end_op);
     if (ZSTD_isError(result)) {
         return (1ULL << 31) | ZSTD_getErrorCode(result);
     }
@@ -407,10 +394,10 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_compressDirec
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    compressDirectByteBuffer0
- * Signature: (Ljava/nio/ByteBuffer;IILjava/nio/ByteBuffer;II)J
+ * Signature: (JLjava/nio/ByteBuffer;IILjava/nio/ByteBuffer;II)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_compressDirectByteBuffer0
-  (JNIEnv *env, jclass jctx, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size) {
+  (JNIEnv *env, jclass jctx, jlong ptr, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size) {
     if (NULL == dst) return -ZSTD_error_dstSize_tooSmall;
     if (NULL == src) return -ZSTD_error_srcSize_wrong;
     if (0 > dst_offset) return -ZSTD_error_dstSize_tooSmall;
@@ -422,7 +409,7 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_compressDirec
     jsize src_cap = (*env)->GetDirectBufferCapacity(env, src);
     if (src_offset + src_size > src_cap) return -ZSTD_error_srcSize_wrong;
 
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, jctx, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
 
     char *dst_buff = (char*)(*env)->GetDirectBufferAddress(env, dst);
     if (dst_buff == NULL) return -ZSTD_error_memory_allocation;
@@ -436,10 +423,10 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_compressDirec
 /*
  * Class:     com_github_luben_zstd_ZstdCompressCtx
  * Method:    compressByteArray0
- * Signature: (B[IIB[II)J
+ * Signature: (JB[IIB[II)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_compressByteArray0
-  (JNIEnv *env, jclass jctx, jbyteArray dst, jint dst_offset, jint dst_size, jbyteArray src, jint src_offset, jint src_size) {
+  (JNIEnv *env, jclass jctx, jlong ptr, jbyteArray dst, jint dst_offset, jint dst_size, jbyteArray src, jint src_offset, jint src_size) {
     size_t size = -ZSTD_error_memory_allocation;
 
     if (0 > dst_offset) return -ZSTD_error_dstSize_tooSmall;
@@ -449,7 +436,7 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdCompressCtx_compressByteA
     if (src_offset + src_size > (*env)->GetArrayLength(env, src)) return -ZSTD_error_srcSize_wrong;
     if (dst_offset + dst_size > (*env)->GetArrayLength(env, dst)) return -ZSTD_error_dstSize_tooSmall;
 
-    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t)(*env)->GetLongField(env, jctx, compress_ctx_nativePtr);
+    ZSTD_CCtx* cctx = (ZSTD_CCtx*)(intptr_t) ptr;
 
     void *dst_buff = (*env)->GetPrimitiveArrayCritical(env, dst, NULL);
     if (dst_buff == NULL) goto E1;
@@ -469,17 +456,13 @@ E1: return size;
 /*
  * Class:     com_github_luben_zstd_ZstdDecompressCtx
  * Method:    init
- * Signature: ()V
+ * Signature: ()J
  */
-JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_init
-  (JNIEnv *env, jobject obj)
+JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_init
+  (JNIEnv *env, jclass clazz)
 {
-    if (decompress_ctx_nativePtr == 0) {
-        jclass clazz = (*env)->GetObjectClass(env, obj);
-        decompress_ctx_nativePtr = (*env)->GetFieldID(env, clazz, "nativePtr", "J");
-    }
     ZSTD_DCtx* dctx = ZSTD_createDCtx();
-    (*env)->SetLongField(env, obj, decompress_ctx_nativePtr, (jlong)(intptr_t) dctx);
+    return (jlong)(intptr_t) dctx;
 }
 
 /*
@@ -488,10 +471,9 @@ JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_init
  * Signature: ()V
  */
 JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_free
-  (JNIEnv *env, jobject obj)
+  (JNIEnv *env, jclass clazz, jlong ptr)
 {
-    if (decompress_ctx_nativePtr == 0) return;
-    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)(*env)->GetLongField(env, obj, decompress_ctx_nativePtr);
+    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)ptr;
     if (NULL == dctx) return;
     ZSTD_freeDCtx(dctx);
 }
@@ -499,12 +481,12 @@ JNIEXPORT void JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_free
 /*
  * Class:     com_github_luben_zstd_ZstdDecompressCtx
  * Method:    loadDDictFast0
- * Signature: (Lcom/github/luben/zstd/ZstdDictDecompress)J
+ * Signature: (JLcom/github/luben/zstd/ZstdDictDecompress;)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_loadDDictFast0
-  (JNIEnv *env, jobject obj, jobject dict)
+  (JNIEnv *env, jclass clazz, jlong ptr, jobject dict)
 {
-    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)(*env)->GetLongField(env, obj, decompress_ctx_nativePtr);
+    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)ptr;
     if (dict == NULL) {
         // remove dictionary
         return ZSTD_DCtx_refDDict(dctx, NULL);
@@ -517,12 +499,12 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_loadDDictFa
 /*
  * Class:     com_github_luben_zstd_ZstdDecompressCtx
  * Method:    loadDDict0
- * Signature: ([B)J
+ * Signature: (J[B)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_loadDDict0
-  (JNIEnv *env, jobject obj, jbyteArray dict)
+  (JNIEnv *env, jclass clazz, jlong ptr, jbyteArray dict)
 {
-    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)(*env)->GetLongField(env, obj, decompress_ctx_nativePtr);
+    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)ptr;
     if (dict == NULL) {
         // remove dictionary
         return ZSTD_DCtx_loadDictionary(dctx, NULL, 0);
@@ -538,16 +520,16 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_loadDDict0
 /*
  * Class:     com_github_luben_zstd_ZstdDecompressCtx
  * Method:    reset0
- * Signature: (L)J
+ * Signature: (J)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_reset0
-  (JNIEnv *env, jclass jctx) {
-    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)(*env)->GetLongField(env, jctx, compress_ctx_nativePtr);
+  (JNIEnv *env, jclass clazz, jlong ptr) {
+    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)ptr;
     return ZSTD_DCtx_reset(dctx, ZSTD_reset_session_and_parameters);
 }
 
 static size_t decompress_direct_buffer_stream
-  (JNIEnv *env, jclass jctx, jobject dst, jint *dst_offset, jint dst_size, jobject src, jint *src_offset, jint src_size)
+  (JNIEnv *env, jlong ptr, jobject dst, jint *dst_offset, jint dst_size, jobject src, jint *src_offset, jint src_size)
 {
     if (NULL == dst) return -ZSTD_error_dstSize_tooSmall;
     if (NULL == src) return -ZSTD_error_srcSize_wrong;
@@ -561,7 +543,7 @@ static size_t decompress_direct_buffer_stream
     jsize src_cap = (*env)->GetDirectBufferCapacity(env, src);
     if (src_size > src_cap) return -ZSTD_error_srcSize_wrong;
 
-    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)(*env)->GetLongField(env, jctx, decompress_ctx_nativePtr);
+    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)ptr;
 
     ZSTD_outBuffer out;
     out.pos = *dst_offset;
@@ -583,12 +565,12 @@ static size_t decompress_direct_buffer_stream
 /*
  * Class:     com_github_luben_zstd_ZstdDecompressCtx
  * Method:    decompressDirectByteBufferStream0
- * Signature: (Ljava/nio/ByteBuffer;IILjava/nio/ByteBuffer;II)J
+ * Signature: (JLjava/nio/ByteBuffer;IILjava/nio/ByteBuffer;II)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_decompressDirectByteBufferStream0
-  (JNIEnv *env, jclass jctx, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size)
+  (JNIEnv *env, jclass jclazz, jlong ptr, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size)
 {
-    size_t result = decompress_direct_buffer_stream(env, jctx, dst, &dst_offset, dst_size, src, &src_offset, src_size);
+    size_t result = decompress_direct_buffer_stream(env, ptr, dst, &dst_offset, dst_size, src, &src_offset, src_size);
     if (ZSTD_isError(result)) {
         return (1ULL << 31) | ZSTD_getErrorCode(result);
     }
@@ -603,10 +585,10 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_decompressD
 /*
  * Class:     com_github_luben_zstd_ZstdDecompressCtx
  * Method:    decompressDirectByteBuffer0
- * Signature: (Ljava/nio/ByteBuffer;IILjava/nio/ByteBuffer;II)J
+ * Signature: (JLjava/nio/ByteBuffer;IILjava/nio/ByteBuffer;II)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_decompressDirectByteBuffer0
-(JNIEnv *env, jclass jctx, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size)
+(JNIEnv *env, jclass jclazz, jlong ptr, jobject dst, jint dst_offset, jint dst_size, jobject src, jint src_offset, jint src_size)
 {
     if (NULL == dst) return -ZSTD_error_dstSize_tooSmall;
     if (NULL == src) return -ZSTD_error_srcSize_wrong;
@@ -619,7 +601,7 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_decompressD
     jsize src_cap = (*env)->GetDirectBufferCapacity(env, src);
     if (src_offset + src_size > src_cap) return -ZSTD_error_srcSize_wrong;
 
-    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)(*env)->GetLongField(env, jctx, decompress_ctx_nativePtr);
+    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)ptr;
 
     char *dst_buff = (char*)(*env)->GetDirectBufferAddress(env, dst);
     if (dst_buff == NULL) return -ZSTD_error_memory_allocation;
@@ -636,7 +618,7 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_decompressD
  * Signature: (B[IIB[II)J
  */
 JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_decompressByteArray0
-  (JNIEnv *env, jclass jctx, jbyteArray dst, jint dst_offset, jint dst_size, jbyteArray src, jint src_offset, jint src_size) {
+  (JNIEnv *env, jclass jclazz, jlong ptr, jbyteArray dst, jint dst_offset, jint dst_size, jbyteArray src, jint src_offset, jint src_size) {
     size_t size = -ZSTD_error_memory_allocation;
 
     if (0 > dst_offset) return -ZSTD_error_dstSize_tooSmall;
@@ -646,7 +628,7 @@ JNIEXPORT jlong JNICALL Java_com_github_luben_zstd_ZstdDecompressCtx_decompressB
     if (src_offset + src_size > (*env)->GetArrayLength(env, src)) return -ZSTD_error_srcSize_wrong;
     if (dst_offset + dst_size > (*env)->GetArrayLength(env, dst)) return -ZSTD_error_dstSize_tooSmall;
 
-    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)(*env)->GetLongField(env, jctx, decompress_ctx_nativePtr);
+    ZSTD_DCtx* dctx = (ZSTD_DCtx*)(intptr_t)ptr;
 
     void *dst_buff = (*env)->GetPrimitiveArrayCritical(env, dst, NULL);
     if (dst_buff == NULL) goto E1;
diff --git a/libfenrir/src/main/jni/compress/zstd/jni_zstd.c b/libfenrir/src/main/jni/compress/zstd/jni_zstd.c
index 812fd3365..9deae72c0 100644
--- a/libfenrir/src/main/jni/compress/zstd/jni_zstd.c
+++ b/libfenrir/src/main/jni/compress/zstd/jni_zstd.c
@@ -39,7 +39,7 @@ static size_t JNI_ZSTD_decompressedSize(const void* buf, size_t bufSize, jboolea
         return frameHeader.frameContentSize;
     }
 
-    return ZSTD_getDecompressedSize(buf, bufSize);
+    return ZSTD_getFrameContentSize(buf, bufSize);
 }
 
 /*
diff --git a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterTexmap.h b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterTexmap.h
index 58906b683..40d4037be 100644
--- a/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterTexmap.h
+++ b/libfenrir/src/main/jni/thorvg/src/lib/sw_engine/tvgSwRasterTexmap.h
@@ -548,7 +548,7 @@ static bool _apply(SwSurface* surface, AASpans* aaSpans)
 static bool _rasterTexmapPolygon(SwSurface* surface, const SwImage* image, const Matrix* transform, const SwBBox* region, uint32_t opacity, uint32_t (*blendMethod)(uint32_t))
 {
     //Exceptions: No dedicated drawing area?
-    if (!region && image->rle->size == 0) return false;
+    if (!image->rle || (!region && image->rle->size == 0)) return false;
 
    /* Prepare vertices.
       shift XY coordinates to match the sub-pixeling technique. */
@@ -605,7 +605,7 @@ static bool _rasterTexmapPolygon(SwSurface* surface, const SwImage* image, const
 static bool _rasterTexmapPolygonMesh(SwSurface* surface, const SwImage* image, const Polygon* triangles, const uint32_t triangleCount, const Matrix* transform, const SwBBox* region, uint32_t opacity, uint32_t (*blendMethod)(uint32_t))
 {
     //Exceptions: No dedicated drawing area?
-    if (!region && image->rle->size == 0) return false;
+    if (!image->rle || (!region && image->rle->size == 0)) return false;
 
     // Step polygons once to transform
     auto transformedTris = (Polygon*)malloc(sizeof(Polygon) * triangleCount);
diff --git a/libfenrir/src/main/kotlin/dev/ragnarok/fenrir/module/animation/AnimatedFileFrame.kt b/libfenrir/src/main/kotlin/dev/ragnarok/fenrir/module/animation/AnimatedFileFrame.kt
index a5c7c5eb4..ddb71acd1 100644
--- a/libfenrir/src/main/kotlin/dev/ragnarok/fenrir/module/animation/AnimatedFileFrame.kt
+++ b/libfenrir/src/main/kotlin/dev/ragnarok/fenrir/module/animation/AnimatedFileFrame.kt
@@ -28,7 +28,7 @@ object AnimatedFileFrame {
         if (nPtr == 0L) {
             return null
         }
-        var ret = Bitmap.createBitmap(metaData[0], metaData[1], Bitmap.Config.ARGB_8888)
+        val ret = Bitmap.createBitmap(metaData[0], metaData[1], Bitmap.Config.ARGB_8888)
         if (getFrameAtTime(
                 nPtr,
                 (metaData[4] / 2).toLong(),
@@ -38,7 +38,8 @@ object AnimatedFileFrame {
             ) == 0
         ) {
             ret.recycle()
-            ret = null
+            destroyDecoder(nPtr)
+            return null
         }
         destroyDecoder(nPtr)
         return ret
diff --git a/material/build.gradle b/material/build.gradle
index 0ee81b34b..c396bf607 100644
--- a/material/build.gradle
+++ b/material/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id("kotlin-android")
 }
 
-//1.9.0-alpha02
+//1.9.0-beta01
 
 def srcDirs = [
         'com/google/android/material/animation',
diff --git a/material/java/com/google/android/material/appbar/AppBarLayout.java b/material/java/com/google/android/material/appbar/AppBarLayout.java
index ca7a98939..bfe9c41fc 100644
--- a/material/java/com/google/android/material/appbar/AppBarLayout.java
+++ b/material/java/com/google/android/material/appbar/AppBarLayout.java
@@ -2214,15 +2214,7 @@ private void updateAppBarLayoutDrawableState(
       if (forceJump || (changed && shouldJumpElevationState(parent, layout))) {
         // If the collapsed state changed, we may need to
         // jump to the current state if we have an overlapping view
-        if (layout.getBackground() != null) {
-          layout.getBackground().jumpToCurrentState();
-        }
-        if (VERSION.SDK_INT >= VERSION_CODES.M && layout.getForeground() != null) {
-          layout.getForeground().jumpToCurrentState();
-        }
-        if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && layout.getStateListAnimator() != null) {
-          layout.getStateListAnimator().jumpToCurrentState();
-        }
+        layout.jumpDrawablesToCurrentState();
       }
     }
 
diff --git a/material/java/com/google/android/material/badge/res/values-af/strings.xml b/material/java/com/google/android/material/badge/res/values-af/strings.xml
index 01c10ffd3..2965530b1 100644
--- a/material/java/com/google/android/material/badge/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-am/strings.xml b/material/java/com/google/android/material/badge/res/values-am/strings.xml
index bcc825c86..d85e6a468 100644
--- a/material/java/com/google/android/material/badge/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ar/strings.xml b/material/java/com/google/android/material/badge/res/values-ar/strings.xml
index 19b82cfdc..cd4f1fc22 100644
--- a/material/java/com/google/android/material/badge/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-as/strings.xml b/material/java/com/google/android/material/badge/res/values-as/strings.xml
index ff19e808f..684ec395e 100644
--- a/material/java/com/google/android/material/badge/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-az/strings.xml b/material/java/com/google/android/material/badge/res/values-az/strings.xml
index c9a8364bf..abd8278db 100644
--- a/material/java/com/google/android/material/badge/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/badge/res/values-b+es+419/strings.xml
index 526d1a74d..477337fbe 100644
--- a/material/java/com/google/android/material/badge/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/badge/res/values-b+sr+Latn/strings.xml
index b6460a1a3..1175545f0 100644
--- a/material/java/com/google/android/material/badge/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-be/strings.xml b/material/java/com/google/android/material/badge/res/values-be/strings.xml
index 9212ee564..4d76d8e39 100644
--- a/material/java/com/google/android/material/badge/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-bg/strings.xml b/material/java/com/google/android/material/badge/res/values-bg/strings.xml
index d5ad25e69..13f6c5361 100644
--- a/material/java/com/google/android/material/badge/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-bn/strings.xml b/material/java/com/google/android/material/badge/res/values-bn/strings.xml
index 5a00cf417..b74db887a 100644
--- a/material/java/com/google/android/material/badge/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-bs/strings.xml b/material/java/com/google/android/material/badge/res/values-bs/strings.xml
index 55e737862..dae23c71e 100644
--- a/material/java/com/google/android/material/badge/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ca/strings.xml b/material/java/com/google/android/material/badge/res/values-ca/strings.xml
index 46c6a0edf..600818e39 100644
--- a/material/java/com/google/android/material/badge/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-cs/strings.xml b/material/java/com/google/android/material/badge/res/values-cs/strings.xml
index 33a01f430..e796021af 100644
--- a/material/java/com/google/android/material/badge/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-da/strings.xml b/material/java/com/google/android/material/badge/res/values-da/strings.xml
index ed063cda3..ae7a74153 100644
--- a/material/java/com/google/android/material/badge/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-de/strings.xml b/material/java/com/google/android/material/badge/res/values-de/strings.xml
index f2ef6a64d..f5880b7d6 100644
--- a/material/java/com/google/android/material/badge/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-el/strings.xml b/material/java/com/google/android/material/badge/res/values-el/strings.xml
index d7605ee6c..91ac61170 100644
--- a/material/java/com/google/android/material/badge/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/badge/res/values-en-rGB/strings.xml
index ff19e808f..684ec395e 100644
--- a/material/java/com/google/android/material/badge/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/badge/res/values-es-rUS/strings.xml
index 526d1a74d..477337fbe 100644
--- a/material/java/com/google/android/material/badge/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-es/strings.xml b/material/java/com/google/android/material/badge/res/values-es/strings.xml
index f2e469804..dd9180f7a 100644
--- a/material/java/com/google/android/material/badge/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-et/strings.xml b/material/java/com/google/android/material/badge/res/values-et/strings.xml
index 023481a93..d68ecb53c 100644
--- a/material/java/com/google/android/material/badge/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-eu/strings.xml b/material/java/com/google/android/material/badge/res/values-eu/strings.xml
index 7270029b8..40bf015c4 100644
--- a/material/java/com/google/android/material/badge/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-fa/strings.xml b/material/java/com/google/android/material/badge/res/values-fa/strings.xml
index f834e5522..31386551b 100644
--- a/material/java/com/google/android/material/badge/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-fi/strings.xml b/material/java/com/google/android/material/badge/res/values-fi/strings.xml
index 6bceeb17c..f310fb4c0 100644
--- a/material/java/com/google/android/material/badge/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/badge/res/values-fr-rCA/strings.xml
index f7f8919d7..cc8503358 100644
--- a/material/java/com/google/android/material/badge/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-fr/strings.xml b/material/java/com/google/android/material/badge/res/values-fr/strings.xml
index cbbfd4a81..9eb745061 100644
--- a/material/java/com/google/android/material/badge/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-gl/strings.xml b/material/java/com/google/android/material/badge/res/values-gl/strings.xml
index f1d9c5400..6caa69224 100644
--- a/material/java/com/google/android/material/badge/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-gu/strings.xml b/material/java/com/google/android/material/badge/res/values-gu/strings.xml
index 4b94f3391..d70e533eb 100644
--- a/material/java/com/google/android/material/badge/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-hi/strings.xml b/material/java/com/google/android/material/badge/res/values-hi/strings.xml
index 6a8d43100..42aced209 100644
--- a/material/java/com/google/android/material/badge/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-hr/strings.xml b/material/java/com/google/android/material/badge/res/values-hr/strings.xml
index 02b085e6f..208f5fd90 100644
--- a/material/java/com/google/android/material/badge/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-hu/strings.xml b/material/java/com/google/android/material/badge/res/values-hu/strings.xml
index 986364d72..e9f6d9d41 100644
--- a/material/java/com/google/android/material/badge/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-hy/strings.xml b/material/java/com/google/android/material/badge/res/values-hy/strings.xml
index b803e4c1c..ddbb144ad 100644
--- a/material/java/com/google/android/material/badge/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-in/strings.xml b/material/java/com/google/android/material/badge/res/values-in/strings.xml
index 7c58a1f17..3e10423f0 100644
--- a/material/java/com/google/android/material/badge/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-is/strings.xml b/material/java/com/google/android/material/badge/res/values-is/strings.xml
index f4d4afa60..9eed3b2f5 100644
--- a/material/java/com/google/android/material/badge/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-it/strings.xml b/material/java/com/google/android/material/badge/res/values-it/strings.xml
index 9a26bc167..8ec0df83d 100644
--- a/material/java/com/google/android/material/badge/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-iw/strings.xml b/material/java/com/google/android/material/badge/res/values-iw/strings.xml
index c19c7f8e6..eb866c904 100644
--- a/material/java/com/google/android/material/badge/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -18,8 +18,9 @@
   <string name="mtrl_exceed_max_badge_number_content_description" tools:ignore="PluralsCandidate">יותר מ-%1$d התראות חדשות</string>
   <string name="mtrl_badge_numberless_content_description">התראה חדשה</string>
   <plurals name="mtrl_badge_content_description">
-    <item quantity="one">%d התראות חדשות</item>
+    <item quantity="one">התראה חדשה אחת (%d)</item>
     <item quantity="two">%d התראות חדשות</item>
+    <item quantity="many">%d התראות חדשות</item>
     <item quantity="other">%d התראות חדשות</item>
   </plurals>
 </resources>
diff --git a/material/java/com/google/android/material/badge/res/values-ja/strings.xml b/material/java/com/google/android/material/badge/res/values-ja/strings.xml
index 08e7df289..0a84355b0 100644
--- a/material/java/com/google/android/material/badge/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ka/strings.xml b/material/java/com/google/android/material/badge/res/values-ka/strings.xml
index a1b04cf1b..089234622 100644
--- a/material/java/com/google/android/material/badge/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-kk/strings.xml b/material/java/com/google/android/material/badge/res/values-kk/strings.xml
index e24eba836..1faff7759 100644
--- a/material/java/com/google/android/material/badge/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-km/strings.xml b/material/java/com/google/android/material/badge/res/values-km/strings.xml
index 0c8bac9c8..fde3d052d 100644
--- a/material/java/com/google/android/material/badge/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-kn/strings.xml b/material/java/com/google/android/material/badge/res/values-kn/strings.xml
index ec8a98efd..9387a03e4 100644
--- a/material/java/com/google/android/material/badge/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ko/strings.xml b/material/java/com/google/android/material/badge/res/values-ko/strings.xml
index d4bcc7f21..341f99f06 100644
--- a/material/java/com/google/android/material/badge/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ky/strings.xml b/material/java/com/google/android/material/badge/res/values-ky/strings.xml
index ec56d6051..8499e7c1e 100644
--- a/material/java/com/google/android/material/badge/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-lo/strings.xml b/material/java/com/google/android/material/badge/res/values-lo/strings.xml
index 9fdd910b7..202f1b12f 100644
--- a/material/java/com/google/android/material/badge/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-lt/strings.xml b/material/java/com/google/android/material/badge/res/values-lt/strings.xml
index 55186a927..49b8b481b 100644
--- a/material/java/com/google/android/material/badge/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-lv/strings.xml b/material/java/com/google/android/material/badge/res/values-lv/strings.xml
index f2b06f935..d8e099254 100644
--- a/material/java/com/google/android/material/badge/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-mk/strings.xml b/material/java/com/google/android/material/badge/res/values-mk/strings.xml
index 42680e735..50c8488ac 100644
--- a/material/java/com/google/android/material/badge/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ml/strings.xml b/material/java/com/google/android/material/badge/res/values-ml/strings.xml
index 14270167b..698326b3e 100644
--- a/material/java/com/google/android/material/badge/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-mn/strings.xml b/material/java/com/google/android/material/badge/res/values-mn/strings.xml
index 83b54db58..4bf9ff6f0 100644
--- a/material/java/com/google/android/material/badge/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-mr/strings.xml b/material/java/com/google/android/material/badge/res/values-mr/strings.xml
index 8ab85477c..08b9dca11 100644
--- a/material/java/com/google/android/material/badge/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ms/strings.xml b/material/java/com/google/android/material/badge/res/values-ms/strings.xml
index 1a923244b..d4ecb271f 100644
--- a/material/java/com/google/android/material/badge/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-my/strings.xml b/material/java/com/google/android/material/badge/res/values-my/strings.xml
index b47bfe5b2..4bc7bb4ba 100644
--- a/material/java/com/google/android/material/badge/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-nb/strings.xml b/material/java/com/google/android/material/badge/res/values-nb/strings.xml
index 6c0ed2a3d..7de9f99e5 100644
--- a/material/java/com/google/android/material/badge/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ne/strings.xml b/material/java/com/google/android/material/badge/res/values-ne/strings.xml
index 96dba9cd0..6856c5c11 100644
--- a/material/java/com/google/android/material/badge/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-nl/strings.xml b/material/java/com/google/android/material/badge/res/values-nl/strings.xml
index 8b2bffc3f..13b0eab28 100644
--- a/material/java/com/google/android/material/badge/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-or/strings.xml b/material/java/com/google/android/material/badge/res/values-or/strings.xml
index ff19e808f..684ec395e 100644
--- a/material/java/com/google/android/material/badge/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-pa/strings.xml b/material/java/com/google/android/material/badge/res/values-pa/strings.xml
index 6caf94d2d..1544b6a4a 100644
--- a/material/java/com/google/android/material/badge/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-pl/strings.xml b/material/java/com/google/android/material/badge/res/values-pl/strings.xml
index 9af92bb17..5846810af 100644
--- a/material/java/com/google/android/material/badge/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/badge/res/values-pt-rBR/strings.xml
index 79258617b..38fd158e0 100644
--- a/material/java/com/google/android/material/badge/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/badge/res/values-pt-rPT/strings.xml
index d0fbb145a..7637be7e2 100644
--- a/material/java/com/google/android/material/badge/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ro/strings.xml b/material/java/com/google/android/material/badge/res/values-ro/strings.xml
index ef881b5d4..33b06b775 100644
--- a/material/java/com/google/android/material/badge/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ru/strings.xml b/material/java/com/google/android/material/badge/res/values-ru/strings.xml
index 340d9695d..6a1678bac 100644
--- a/material/java/com/google/android/material/badge/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-si/strings.xml b/material/java/com/google/android/material/badge/res/values-si/strings.xml
index 9c41bb6ce..c7ab25572 100644
--- a/material/java/com/google/android/material/badge/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-sk/strings.xml b/material/java/com/google/android/material/badge/res/values-sk/strings.xml
index b6bfb6149..2cdda0e4c 100644
--- a/material/java/com/google/android/material/badge/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-sl/strings.xml b/material/java/com/google/android/material/badge/res/values-sl/strings.xml
index 6368b7c13..58fd54c47 100644
--- a/material/java/com/google/android/material/badge/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-sq/strings.xml b/material/java/com/google/android/material/badge/res/values-sq/strings.xml
index 46f01f006..bef766712 100644
--- a/material/java/com/google/android/material/badge/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-sr/strings.xml b/material/java/com/google/android/material/badge/res/values-sr/strings.xml
index 5bffd6d35..2b1183bf8 100644
--- a/material/java/com/google/android/material/badge/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-sv/strings.xml b/material/java/com/google/android/material/badge/res/values-sv/strings.xml
index 06c381106..f35c051d6 100644
--- a/material/java/com/google/android/material/badge/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-sw/strings.xml b/material/java/com/google/android/material/badge/res/values-sw/strings.xml
index 17959515b..332119a79 100644
--- a/material/java/com/google/android/material/badge/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ta/strings.xml b/material/java/com/google/android/material/badge/res/values-ta/strings.xml
index 93a572d3c..a17c371a2 100644
--- a/material/java/com/google/android/material/badge/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-te/strings.xml b/material/java/com/google/android/material/badge/res/values-te/strings.xml
index 71a2f8af0..cfd2396c2 100644
--- a/material/java/com/google/android/material/badge/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-th/strings.xml b/material/java/com/google/android/material/badge/res/values-th/strings.xml
index ed79f92b0..c18c3c6b2 100644
--- a/material/java/com/google/android/material/badge/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-tl/strings.xml b/material/java/com/google/android/material/badge/res/values-tl/strings.xml
index 14211f331..f7a0732c9 100644
--- a/material/java/com/google/android/material/badge/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-tr/strings.xml b/material/java/com/google/android/material/badge/res/values-tr/strings.xml
index 486248c0d..79eff6083 100644
--- a/material/java/com/google/android/material/badge/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-uk/strings.xml b/material/java/com/google/android/material/badge/res/values-uk/strings.xml
index 6a4dfe2b5..0efa23a14 100644
--- a/material/java/com/google/android/material/badge/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-ur/strings.xml b/material/java/com/google/android/material/badge/res/values-ur/strings.xml
index 992285f61..70e6cb14f 100644
--- a/material/java/com/google/android/material/badge/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-uz/strings.xml b/material/java/com/google/android/material/badge/res/values-uz/strings.xml
index e0cc77a4d..b34758e63 100644
--- a/material/java/com/google/android/material/badge/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-vi/strings.xml b/material/java/com/google/android/material/badge/res/values-vi/strings.xml
index 8689ccf71..d717054eb 100644
--- a/material/java/com/google/android/material/badge/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/badge/res/values-zh-rCN/strings.xml
index 77c4bf394..14f3c5f36 100644
--- a/material/java/com/google/android/material/badge/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/badge/res/values-zh-rHK/strings.xml
index 65169e09d..0a750970f 100644
--- a/material/java/com/google/android/material/badge/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/badge/res/values-zh-rTW/strings.xml
index ffc54c0e2..4aaed8c00 100644
--- a/material/java/com/google/android/material/badge/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/badge/res/values-zu/strings.xml b/material/java/com/google/android/material/badge/res/values-zu/strings.xml
index edffd31ea..f4fcf8bd7 100644
--- a/material/java/com/google/android/material/badge/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/badge/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java b/material/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
index d0a1aa6bd..236012d93 100644
--- a/material/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
+++ b/material/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
@@ -217,8 +217,6 @@ void onLayout(@NonNull View bottomSheet) {}
 
   private static final int VIEW_INDEX_BOTTOM_SHEET = 0;
 
-  private static final int INVALID_POSITION = -1;
-
   @VisibleForTesting
   static final int VIEW_INDEX_ACCESSIBILITY_DELEGATE_VIEW = 1;
 
@@ -323,7 +321,7 @@ void onLayout(@NonNull View bottomSheet) {}
 
   int activePointerId;
 
-  private int initialY = INVALID_POSITION;
+  private int initialY;
 
   boolean touchingScrollingChild;
 
@@ -657,7 +655,6 @@ public boolean onInterceptTouchEvent(
         && state != STATE_DRAGGING
         && !parent.isPointInChildBounds(scroll, (int) event.getX(), (int) event.getY())
         && viewDragHelper != null
-        && initialY != INVALID_POSITION
         && Math.abs(initialY - event.getY()) > viewDragHelper.getTouchSlop();
   }
 
@@ -1465,7 +1462,6 @@ private float calculateSlideOffsetWithTop(int top) {
 
   private void reset() {
     activePointerId = ViewDragHelper.INVALID_POINTER;
-    initialY = INVALID_POSITION;
     if (velocityTracker != null) {
       velocityTracker.recycle();
       velocityTracker = null;
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-af/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-af/strings.xml
index 91e04863b..6a70b5e25 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-am/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-am/strings.xml
index d3cc52901..1a65097ef 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ar/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ar/strings.xml
index 6831d6e47..4e6330bd2 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-as/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-as/strings.xml
index c556aad51..b293233b3 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-az/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-az/strings.xml
index bdafce5f7..7dcccde5f 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-b+es+419/strings.xml
index d0efd265e..5d7b259f5 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-b+sr+Latn/strings.xml
index 86b118c3b..405fcb956 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-be/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-be/strings.xml
index f057df5db..769d8da08 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-bg/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-bg/strings.xml
index 4760c9aca..2d2b87599 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-bn/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-bn/strings.xml
index 807428dd0..5caab6e27 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-bs/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-bs/strings.xml
index 3c16d1b04..c0f04acc0 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ca/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ca/strings.xml
index d5fc5ff91..3e61cd386 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-cs/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-cs/strings.xml
index 58bdb022a..1006572d0 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-da/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-da/strings.xml
index fe4edaa0e..7fc4efbe1 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-de/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-de/strings.xml
index 2b36aaa71..ab127ff8b 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-el/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-el/strings.xml
index bd2cdc0f0..8a53a1207 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-en-rGB/strings.xml
index c556aad51..b293233b3 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-es-rUS/strings.xml
index d0efd265e..5d7b259f5 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-es/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-es/strings.xml
index 8398c32b7..6e8bc292d 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-et/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-et/strings.xml
index d862ca3c8..902dc1adb 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-eu/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-eu/strings.xml
index 9a8c6f5ee..4f800f959 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-fa/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-fa/strings.xml
index 8d3a2b9a3..9bbdf7741 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-fi/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-fi/strings.xml
index e36443c02..e799c5207 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-fr-rCA/strings.xml
index a2002f30a..577b9df2b 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-fr/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-fr/strings.xml
index 9f5402591..87120a7a3 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-gl/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-gl/strings.xml
index 96cf5300f..7b10a56a6 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-gu/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-gu/strings.xml
index d6c18fc3c..01c635c6f 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-hi/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-hi/strings.xml
index 161e0a241..4c446018a 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-hr/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-hr/strings.xml
index 19f68cf8b..8e17cb4f1 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-hu/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-hu/strings.xml
index d8d62bba6..92d57e3e3 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-hy/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-hy/strings.xml
index 4ca95cc0f..e92e493d7 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-in/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-in/strings.xml
index ab992417a..7418fe592 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-is/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-is/strings.xml
index 914e12bea..9de7960ac 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-it/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-it/strings.xml
index e52581745..7836f93f2 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-iw/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-iw/strings.xml
index 92266782d..59b10a8e6 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ja/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ja/strings.xml
index 55afa22dd..af1619593 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ka/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ka/strings.xml
index 3025faa3f..d99f2c287 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-kk/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-kk/strings.xml
index 28ba29d38..a4d5ceaa4 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-km/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-km/strings.xml
index 8f00897fb..9e0a3ebea 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-kn/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-kn/strings.xml
index 74907dc4c..6098ae981 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ko/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ko/strings.xml
index 40896b7f2..d1e75ed3e 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ky/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ky/strings.xml
index 06655bb3e..f369fb116 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-lo/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-lo/strings.xml
index 3cbe8b6ce..00d0b8957 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-lt/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-lt/strings.xml
index b0224ebf9..d14d84082 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-lv/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-lv/strings.xml
index 5721897c2..2a36522be 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-mk/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-mk/strings.xml
index 0b43c1793..d623ede0b 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ml/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ml/strings.xml
index ab3bcdf65..f0ecd5292 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-mn/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-mn/strings.xml
index 79f056423..d1335e279 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-mr/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-mr/strings.xml
index cd8ce0148..4b6d8e398 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ms/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ms/strings.xml
index 674fdb726..78aa4038f 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-my/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-my/strings.xml
index db04daa00..1cef9f4e4 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-nb/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-nb/strings.xml
index e5731348b..c4ec2dd27 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ne/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ne/strings.xml
index 6445abf3c..e8dbd2f11 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-nl/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-nl/strings.xml
index cbc60592e..450940b2c 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-or/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-or/strings.xml
index c556aad51..b293233b3 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-pa/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-pa/strings.xml
index 020347f07..a4057a8c7 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-pl/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-pl/strings.xml
index ed53234b6..88fc4d9ea 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-pt-rBR/strings.xml
index 13f9ec17d..f174b1d91 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-pt-rPT/strings.xml
index 6e820a5bf..8bdea6939 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ro/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ro/strings.xml
index 69ba882c3..6885269dc 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ru/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ru/strings.xml
index 5142beaae..aa741df32 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-si/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-si/strings.xml
index 1ade12127..c7c9ddf0b 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-sk/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-sk/strings.xml
index 297760a9e..560091b24 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-sl/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-sl/strings.xml
index e54ad0580..3397c55eb 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-sq/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-sq/strings.xml
index 8c638e90b..f33dfaa1a 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-sr/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-sr/strings.xml
index 222bb69d5..6c68b053e 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-sv/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-sv/strings.xml
index 207790bf8..21bdbfac6 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-sw/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-sw/strings.xml
index 4e16a9c6f..967d59be3 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ta/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ta/strings.xml
index 328729365..325350789 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-te/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-te/strings.xml
index 8d62ae775..efef61b8c 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-th/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-th/strings.xml
index 43f0f3d89..b37e83ddf 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-tl/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-tl/strings.xml
index e316e924f..a18efe8a9 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-tr/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-tr/strings.xml
index 02496c9d3..06169e425 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-uk/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-uk/strings.xml
index 578fec869..2505e76f8 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-ur/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-ur/strings.xml
index 85a5e5928..09cc1b853 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-uz/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-uz/strings.xml
index e6fae3e8c..cfa098fdb 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-vi/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-vi/strings.xml
index 2925f7015..258155b5a 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-zh-rCN/strings.xml
index 6d3aa9a0f..c8ffff2bb 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-zh-rHK/strings.xml
index f194035cd..61d3a56cc 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-zh-rTW/strings.xml
index e9e92b06c..b0c5af43e 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/bottomsheet/res/values-zu/strings.xml b/material/java/com/google/android/material/bottomsheet/res/values-zu/strings.xml
index 8acd4998e..d209035df 100644
--- a/material/java/com/google/android/material/bottomsheet/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/bottomsheet/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/canvas/CanvasCompat.java b/material/java/com/google/android/material/canvas/CanvasCompat.java
index 8bef121b3..651e31c71 100644
--- a/material/java/com/google/android/material/canvas/CanvasCompat.java
+++ b/material/java/com/google/android/material/canvas/CanvasCompat.java
@@ -61,4 +61,12 @@ public static int saveLayerAlpha(
       return canvas.saveLayerAlpha(left, top, right, bottom, alpha, Canvas.ALL_SAVE_FLAG);
     }
   }
+
+  /**
+   * Helper interface to allow delegates to alter the canvas before and after a canvas operation.
+   */
+  public interface CanvasOperation {
+    void run(@NonNull Canvas canvas);
+  }
+
 }
diff --git a/material/java/com/google/android/material/carousel/Maskable.java b/material/java/com/google/android/material/carousel/Maskable.java
index 4f2084b5e..2c4205542 100644
--- a/material/java/com/google/android/material/carousel/Maskable.java
+++ b/material/java/com/google/android/material/carousel/Maskable.java
@@ -20,10 +20,9 @@
 import android.view.View;
 import androidx.annotation.FloatRange;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
-/**
- * Interface for any view that can clip itself and all children to a percentage of its size.
- */
+/** Interface for any view that can clip itself and all children to a percentage of its size. */
 interface Maskable {
 
   /**
@@ -45,9 +44,11 @@ interface Maskable {
   @NonNull
   RectF getMaskRectF();
 
-  /** Adds an {@link OnMaskChangedListener}. */
-  void addOnMaskChangedListener(@NonNull OnMaskChangedListener listener);
-
-  /** Removes an {@link OnMaskChangedListener}. */
-  void removeOnMaskChangedListener(@NonNull OnMaskChangedListener listener);
+  /**
+   * Sets an {@link OnMaskChangedListener}.
+   *
+   * @param listener a listener to receive callbacks for changes in the mask or null to clear the
+   *     listener.
+   */
+  void setOnMaskChangedListener(@Nullable OnMaskChangedListener listener);
 }
diff --git a/material/java/com/google/android/material/carousel/MaskableFrameLayout.java b/material/java/com/google/android/material/carousel/MaskableFrameLayout.java
index d5ee7d77d..89f9bcf8a 100644
--- a/material/java/com/google/android/material/carousel/MaskableFrameLayout.java
+++ b/material/java/com/google/android/material/carousel/MaskableFrameLayout.java
@@ -21,6 +21,7 @@
 import android.graphics.Canvas;
 import android.graphics.Outline;
 import android.graphics.Path;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.os.Build.VERSION;
 import android.os.Build.VERSION_CODES;
@@ -33,22 +34,26 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RequiresApi;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+import androidx.annotation.VisibleForTesting;
 import androidx.core.math.MathUtils;
 import com.google.android.material.animation.AnimationUtils;
+import com.google.android.material.canvas.CanvasCompat.CanvasOperation;
+import com.google.android.material.shape.AbsoluteCornerSize;
+import com.google.android.material.shape.ClampedCornerSize;
 import com.google.android.material.shape.ShapeAppearanceModel;
-import java.util.ArrayList;
-import java.util.List;
+import com.google.android.material.shape.ShapeAppearancePathProvider;
+import com.google.android.material.shape.Shapeable;
 
 /** A {@link FrameLayout} than is able to mask itself and all children. */
-public class MaskableFrameLayout extends FrameLayout implements Maskable {
+public class MaskableFrameLayout extends FrameLayout implements Maskable, Shapeable {
 
   private float maskXPercentage = 0F;
   private final RectF maskRect = new RectF();
-  private final Path maskPath = new Path();
-
-  private final List<OnMaskChangedListener> onMaskChangedListeners = new ArrayList<>();
-
-  private final ShapeAppearanceModel shapeAppearanceModel;
+  @Nullable private OnMaskChangedListener onMaskChangedListener;
+  @NonNull private ShapeAppearanceModel shapeAppearanceModel;
+  private final MaskableDelegate maskableDelegate = createMaskableDelegate();
 
   public MaskableFrameLayout(@NonNull Context context) {
     this(context, null);
@@ -61,9 +66,17 @@ public MaskableFrameLayout(@NonNull Context context, @Nullable AttributeSet attr
   public MaskableFrameLayout(
       @NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
-    shapeAppearanceModel = ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0, 0).build();
-    if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-      MaskableImplV21.initMaskOutlineProvider(this);
+    setShapeAppearanceModel(
+        ShapeAppearanceModel.builder(context, attrs, defStyleAttr, 0, 0).build());
+  }
+
+  private MaskableDelegate createMaskableDelegate() {
+    if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
+      return new MaskableDelegateV33(this);
+    } else if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
+      return new MaskableDelegateV21(this);
+    } else {
+      return new MaskableDelegateV14();
     }
   }
 
@@ -73,6 +86,30 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     onMaskChanged();
   }
 
+  @Override
+  public void setShapeAppearanceModel(@NonNull ShapeAppearanceModel shapeAppearanceModel) {
+    this.shapeAppearanceModel =
+        shapeAppearanceModel.withTransformedCornerSizes(
+            cornerSize -> {
+              if (cornerSize instanceof AbsoluteCornerSize) {
+                // Enforce that the corners of the shape appearance are never larger than half the
+                // width of the shortest edge. As the size of the mask changes, we never want the
+                // corners to be larger than half the width or height of this view.
+                return ClampedCornerSize.createFromCornerSize((AbsoluteCornerSize) cornerSize);
+              } else {
+                // Relative corner size already enforces a max size based on shortest edge.
+                return cornerSize;
+              }
+            });
+    maskableDelegate.onShapeAppearanceChanged(this, this.shapeAppearanceModel);
+  }
+
+  @NonNull
+  @Override
+  public ShapeAppearanceModel getShapeAppearanceModel() {
+    return shapeAppearanceModel;
+  }
+
   /**
    * Sets the percentage by which this {@link View} masks by along the x axis.
    *
@@ -105,13 +142,8 @@ public RectF getMaskRectF() {
   }
 
   @Override
-  public void addOnMaskChangedListener(@NonNull OnMaskChangedListener listener) {
-    onMaskChangedListeners.add(listener);
-  }
-
-  @Override
-  public void removeOnMaskChangedListener(@NonNull OnMaskChangedListener listener) {
-    onMaskChangedListeners.remove(listener);
+  public void setOnMaskChangedListener(@Nullable OnMaskChangedListener onMaskChangedListener) {
+    this.onMaskChangedListener = onMaskChangedListener;
   }
 
   private void onMaskChanged() {
@@ -122,26 +154,22 @@ private void onMaskChanged() {
     // masked away.
     float maskWidth = AnimationUtils.lerp(0f, getWidth() / 2F, 0f, 1f, maskXPercentage);
     maskRect.set(maskWidth, 0F, (getWidth() - maskWidth), getHeight());
-    for (OnMaskChangedListener listener : onMaskChangedListeners) {
-      listener.onMaskChanged(maskRect);
+    maskableDelegate.onMaskChanged(this, maskRect);
+    if (onMaskChangedListener != null) {
+      onMaskChangedListener.onMaskChanged(maskRect);
     }
-    refreshMaskPath();
   }
 
-  private float getCornerRadiusFromShapeAppearance() {
-    return shapeAppearanceModel.getTopRightCornerSize().getCornerSize(maskRect);
-  }
 
-  private void refreshMaskPath() {
-    if (!maskRect.isEmpty()) {
-      maskPath.rewind();
-      float cornerRadius = getCornerRadiusFromShapeAppearance();
-      maskPath.addRoundRect(maskRect, cornerRadius, cornerRadius, Path.Direction.CW);
-      if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
-        invalidateOutline();
-      }
-      invalidate();
-    }
+  /**
+   * Set whether this view should always use canvas clipping to clip to its masked shape.
+   *
+   * @hide
+   */
+  @VisibleForTesting
+  @RestrictTo(Scope.LIBRARY_GROUP)
+  public void setForceCompatClipping(boolean forceCompatClipping) {
+    maskableDelegate.setForceCompatClippingEnabled(this, forceCompatClipping);
   }
 
   @SuppressLint("ClickableViewAccessibility")
@@ -160,33 +188,220 @@ public boolean onTouchEvent(MotionEvent event) {
 
   @Override
   protected void dispatchDraw(Canvas canvas) {
-    canvas.save();
-    if (!maskPath.isEmpty()) {
-      canvas.clipPath(maskPath);
+    maskableDelegate.maybeClip(canvas, super::dispatchDraw);
+  }
+
+  /**
+   * A delegate able to handle logic for when and how to mask a View based on the View's {@link
+   * ShapeAppearanceModel} and mask bounds.
+   */
+  private abstract static class MaskableDelegate {
+
+    boolean forceCompatClippingEnabled = false;
+    @Nullable ShapeAppearanceModel shapeAppearanceModel;
+    RectF maskBounds = new RectF();
+    final Path shapePath = new Path();
+
+    /**
+     * Called due to changes in a delegate's shape, mask bounds or other parameters. Delegate
+     * implementations should use this as an opportunity to ensure their method of clipping is
+     * appropriate and invalidate the client view if necessary.
+     *
+     * @param view the client view
+     */
+    abstract void invalidateClippingMethod(View view);
+
+    /**
+     * Whether the client view should use canvas clipping to mask itself.
+     *
+     * <p>Note: It's important that no significant logic is run in this method as it is called from
+     * dispatch draw, which should be as performant as possible. Logic for determining whether
+     * compat clipping is used should be run elsewhere and stored for quick access.
+     *
+     * @return true if the client view should clip the canvas
+     */
+    abstract boolean shouldUseCompatClipping();
+
+    /**
+     * Set whether the client would like to always use compat clipping regardless of whether other
+     * means are available.
+     *
+     * @param view the client view
+     * @param enabled true if the client should always use canvas clipping
+     */
+    void setForceCompatClippingEnabled(View view, boolean enabled) {
+      if (enabled != this.forceCompatClippingEnabled) {
+        this.forceCompatClippingEnabled = enabled;
+        invalidateClippingMethod(view);
+      }
+    }
+
+    /**
+     * Called whenever the {@link ShapeAppearanceModel} of the client changes.
+     *
+     * @param view the client view
+     * @param shapeAppearanceModel the update {@link ShapeAppearanceModel}
+     */
+    void onShapeAppearanceChanged(View view, @NonNull ShapeAppearanceModel shapeAppearanceModel) {
+      this.shapeAppearanceModel = shapeAppearanceModel;
+      updateShapePath();
+      invalidateClippingMethod(view);
+    }
+
+    /**
+     * Called whenever the bounds of the clients mask changes.
+     *
+     * @param view the client view
+     * @param maskBounds the updated bounds
+     */
+    void onMaskChanged(View view, RectF maskBounds) {
+      this.maskBounds = maskBounds;
+      updateShapePath();
+      invalidateClippingMethod(view);
+    }
+
+    private void updateShapePath() {
+      if (!maskBounds.isEmpty() && shapeAppearanceModel != null) {
+        ShapeAppearancePathProvider.getInstance()
+            .calculatePath(shapeAppearanceModel, 1F, maskBounds, shapePath);
+      }
+    }
+
+    void maybeClip(Canvas canvas, CanvasOperation op) {
+      if (shouldUseCompatClipping() && !shapePath.isEmpty()) {
+        canvas.save();
+        canvas.clipPath(shapePath);
+        op.run(canvas);
+        canvas.restore();
+      } else {
+        op.run(canvas);
+      }
+    }
+  }
+
+  /**
+   * A {@link MaskableDelegate} implementation for API 14-20 that always clips using canvas
+   * clipping.
+   */
+  private static class MaskableDelegateV14 extends MaskableDelegate {
+
+    @Override
+    boolean shouldUseCompatClipping() {
+      return true;
+    }
+
+    @Override
+    void invalidateClippingMethod(View view) {
+      if (shapeAppearanceModel == null || maskBounds.isEmpty()) {
+        return;
+      }
+
+      if (shouldUseCompatClipping()) {
+        view.invalidate();
+      }
     }
-    super.dispatchDraw(canvas);
-    canvas.restore();
   }
 
+  /**
+   * A {@link MaskableDelegate} for API 21-32 that uses {@link ViewOutlineProvider} to clip when the
+   * shape being clipped is a round rect with symmetrical corners and canvas clipping for all other
+   * shapes.
+   *
+   * <p>{@link Outline#setRoundRect(Rect, float)} is only able to clip to a rectangle with a single
+   * corner radius for all four corners.
+   */
   @RequiresApi(VERSION_CODES.LOLLIPOP)
-  private static class MaskableImplV21 {
+  private static class MaskableDelegateV21 extends MaskableDelegate {
+
+    private boolean isShapeRoundRect = false;
+
+    MaskableDelegateV21(View view) {
+      initMaskOutlineProvider(view);
+    }
+
+    @Override
+    public boolean shouldUseCompatClipping() {
+      return !isShapeRoundRect || forceCompatClippingEnabled;
+    }
+
+    @Override
+    void invalidateClippingMethod(View view) {
+      updateIsShapeRoundRect();
+      view.setClipToOutline(!shouldUseCompatClipping());
+      if (shouldUseCompatClipping()) {
+        view.invalidate();
+      } else {
+        view.invalidateOutline();
+      }
+    }
+
+    private void updateIsShapeRoundRect() {
+      if (!maskBounds.isEmpty() && shapeAppearanceModel != null) {
+        isShapeRoundRect = shapeAppearanceModel.isRoundRect(maskBounds);
+      }
+    }
+
+    private float getCornerRadiusFromShapeAppearance(
+        @NonNull ShapeAppearanceModel shapeAppearanceModel, @NonNull RectF bounds) {
+      return shapeAppearanceModel.getTopRightCornerSize().getCornerSize(bounds);
+    }
 
     @DoNotInline
-    private static void initMaskOutlineProvider(MaskableFrameLayout maskableFrameLayout) {
-      maskableFrameLayout.setClipToOutline(true);
-      maskableFrameLayout.setOutlineProvider(
+    private void initMaskOutlineProvider(View view) {
+      view.setOutlineProvider(
           new ViewOutlineProvider() {
             @Override
             public void getOutline(View view, Outline outline) {
-              RectF maskRect = ((MaskableFrameLayout) view).getMaskRectF();
-              float cornerSize = ((MaskableFrameLayout) view).getCornerRadiusFromShapeAppearance();
-              if (!maskRect.isEmpty()) {
+              if (shapeAppearanceModel != null && !maskBounds.isEmpty()) {
                 outline.setRoundRect(
-                    (int) maskRect.left,
-                    (int) maskRect.top,
-                    (int) maskRect.right,
-                    (int) maskRect.bottom,
-                    cornerSize);
+                    (int) maskBounds.left,
+                    (int) maskBounds.top,
+                    (int) maskBounds.right,
+                    (int) maskBounds.bottom,
+                    getCornerRadiusFromShapeAppearance(shapeAppearanceModel, maskBounds));
+              }
+            }
+          });
+    }
+  }
+
+  /**
+   * A {@link MaskableDelegate} for API 33+ that uses {@link ViewOutlineProvider} to clip for
+   * all shapes.
+   *
+   * <p>{@link Outline#setPath(Path)} was added in API 33 and allows using {@link
+   * ViewOutlineProvider} to clip for all shapes.
+   */
+  @RequiresApi(VERSION_CODES.TIRAMISU)
+  private static class MaskableDelegateV33 extends MaskableDelegate {
+
+    MaskableDelegateV33(View view) {
+      initMaskOutlineProvider(view);
+    }
+
+    @Override
+    public boolean shouldUseCompatClipping() {
+      return forceCompatClippingEnabled;
+    }
+
+    @Override
+    void invalidateClippingMethod(View view) {
+      view.setClipToOutline(!shouldUseCompatClipping());
+      if (shouldUseCompatClipping()) {
+        view.invalidate();
+      } else {
+        view.invalidateOutline();
+      }
+    }
+
+    @DoNotInline
+    private void initMaskOutlineProvider(View view) {
+      view.setOutlineProvider(
+          new ViewOutlineProvider() {
+            @Override
+            public void getOutline(View view, Outline outline) {
+              if (!shapePath.isEmpty()) {
+                outline.setPath(shapePath);
               }
             }
           });
diff --git a/material/java/com/google/android/material/chip/Chip.java b/material/java/com/google/android/material/chip/Chip.java
index f37b3d4d0..a99f5d076 100644
--- a/material/java/com/google/android/material/chip/Chip.java
+++ b/material/java/com/google/android/material/chip/Chip.java
@@ -968,7 +968,7 @@ public PointerIcon onResolvePointerIcon(@NonNull MotionEvent event, int pointerI
     if (getCloseIconTouchBounds().contains(event.getX(), event.getY()) && isEnabled()) {
       return PointerIcon.getSystemIcon(getContext(), PointerIcon.TYPE_HAND);
     }
-    return super.onResolvePointerIcon(event, pointerIndex);
+    return null;
   }
 
   /** @hide */
diff --git a/material/java/com/google/android/material/chip/res/values-af/strings.xml b/material/java/com/google/android/material/chip/res/values-af/strings.xml
index 7f298b296..821443b81 100644
--- a/material/java/com/google/android/material/chip/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-am/strings.xml b/material/java/com/google/android/material/chip/res/values-am/strings.xml
index d23bfc5f6..a4df95d15 100644
--- a/material/java/com/google/android/material/chip/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ar/strings.xml b/material/java/com/google/android/material/chip/res/values-ar/strings.xml
index 432c73054..242239558 100644
--- a/material/java/com/google/android/material/chip/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-as/strings.xml b/material/java/com/google/android/material/chip/res/values-as/strings.xml
index 923023faf..b2a7ad4ac 100644
--- a/material/java/com/google/android/material/chip/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-az/strings.xml b/material/java/com/google/android/material/chip/res/values-az/strings.xml
index dd132c06d..0c2eb0430 100644
--- a/material/java/com/google/android/material/chip/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/chip/res/values-b+es+419/strings.xml
index 0e2645e09..aef054353 100644
--- a/material/java/com/google/android/material/chip/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/chip/res/values-b+sr+Latn/strings.xml
index c74d92002..96cfbc74a 100644
--- a/material/java/com/google/android/material/chip/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-be/strings.xml b/material/java/com/google/android/material/chip/res/values-be/strings.xml
index f213bee10..f128ed662 100644
--- a/material/java/com/google/android/material/chip/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-bg/strings.xml b/material/java/com/google/android/material/chip/res/values-bg/strings.xml
index 6d93fe797..9c1a6c1d9 100644
--- a/material/java/com/google/android/material/chip/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-bn/strings.xml b/material/java/com/google/android/material/chip/res/values-bn/strings.xml
index 565c5130a..995e5b18c 100644
--- a/material/java/com/google/android/material/chip/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-bs/strings.xml b/material/java/com/google/android/material/chip/res/values-bs/strings.xml
index c74d92002..96cfbc74a 100644
--- a/material/java/com/google/android/material/chip/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ca/strings.xml b/material/java/com/google/android/material/chip/res/values-ca/strings.xml
index e3b84591e..758543ef9 100644
--- a/material/java/com/google/android/material/chip/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-cs/strings.xml b/material/java/com/google/android/material/chip/res/values-cs/strings.xml
index 298f94827..11c1473f0 100644
--- a/material/java/com/google/android/material/chip/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-da/strings.xml b/material/java/com/google/android/material/chip/res/values-da/strings.xml
index 4d1eeff40..a2c1e4c97 100644
--- a/material/java/com/google/android/material/chip/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-de/strings.xml b/material/java/com/google/android/material/chip/res/values-de/strings.xml
index a34867a74..ea236e439 100644
--- a/material/java/com/google/android/material/chip/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-el/strings.xml b/material/java/com/google/android/material/chip/res/values-el/strings.xml
index 06a0239ff..d9d3e68ed 100644
--- a/material/java/com/google/android/material/chip/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/chip/res/values-en-rGB/strings.xml
index 8cc536e35..902c263e8 100644
--- a/material/java/com/google/android/material/chip/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/chip/res/values-es-rUS/strings.xml
index 0e2645e09..aef054353 100644
--- a/material/java/com/google/android/material/chip/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-es/strings.xml b/material/java/com/google/android/material/chip/res/values-es/strings.xml
index 7cb0d240c..dfe33af5f 100644
--- a/material/java/com/google/android/material/chip/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-et/strings.xml b/material/java/com/google/android/material/chip/res/values-et/strings.xml
index ebf5669fe..0389bc0c4 100644
--- a/material/java/com/google/android/material/chip/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-eu/strings.xml b/material/java/com/google/android/material/chip/res/values-eu/strings.xml
index c67222e95..79ab340fe 100644
--- a/material/java/com/google/android/material/chip/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-fa/strings.xml b/material/java/com/google/android/material/chip/res/values-fa/strings.xml
index a612cad2d..7f5e2ed20 100644
--- a/material/java/com/google/android/material/chip/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-fi/strings.xml b/material/java/com/google/android/material/chip/res/values-fi/strings.xml
index c18a0e48f..7a2a3ee91 100644
--- a/material/java/com/google/android/material/chip/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/chip/res/values-fr-rCA/strings.xml
index f2564c08d..2f033d9ca 100644
--- a/material/java/com/google/android/material/chip/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-fr/strings.xml b/material/java/com/google/android/material/chip/res/values-fr/strings.xml
index f2564c08d..2f033d9ca 100644
--- a/material/java/com/google/android/material/chip/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-gl/strings.xml b/material/java/com/google/android/material/chip/res/values-gl/strings.xml
index 984c03a06..4a46d6a16 100644
--- a/material/java/com/google/android/material/chip/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-gu/strings.xml b/material/java/com/google/android/material/chip/res/values-gu/strings.xml
index 08e977e16..439745deb 100644
--- a/material/java/com/google/android/material/chip/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-hi/strings.xml b/material/java/com/google/android/material/chip/res/values-hi/strings.xml
index 29c8439dc..49d973275 100644
--- a/material/java/com/google/android/material/chip/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-hr/strings.xml b/material/java/com/google/android/material/chip/res/values-hr/strings.xml
index 14f386b53..c51d5964a 100644
--- a/material/java/com/google/android/material/chip/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-hu/strings.xml b/material/java/com/google/android/material/chip/res/values-hu/strings.xml
index d41348e31..5a254a833 100644
--- a/material/java/com/google/android/material/chip/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-hy/strings.xml b/material/java/com/google/android/material/chip/res/values-hy/strings.xml
index 6d6d83398..2dc7af30b 100644
--- a/material/java/com/google/android/material/chip/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-in/strings.xml b/material/java/com/google/android/material/chip/res/values-in/strings.xml
index 7768b7cb0..682d828f9 100644
--- a/material/java/com/google/android/material/chip/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-is/strings.xml b/material/java/com/google/android/material/chip/res/values-is/strings.xml
index 1da859ed6..27be7d736 100644
--- a/material/java/com/google/android/material/chip/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-it/strings.xml b/material/java/com/google/android/material/chip/res/values-it/strings.xml
index 6e2bc2d33..07e74588b 100644
--- a/material/java/com/google/android/material/chip/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-iw/strings.xml b/material/java/com/google/android/material/chip/res/values-iw/strings.xml
index 95f4e3763..eb8de4d14 100644
--- a/material/java/com/google/android/material/chip/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ja/strings.xml b/material/java/com/google/android/material/chip/res/values-ja/strings.xml
index 5144e47e4..acc06b1b7 100644
--- a/material/java/com/google/android/material/chip/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ka/strings.xml b/material/java/com/google/android/material/chip/res/values-ka/strings.xml
index a42016abe..c46d7837c 100644
--- a/material/java/com/google/android/material/chip/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-kk/strings.xml b/material/java/com/google/android/material/chip/res/values-kk/strings.xml
index d2af8166a..5ca58fb61 100644
--- a/material/java/com/google/android/material/chip/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -15,5 +15,5 @@
   ~ limitations under the License.
 -->
 <resources>
-  <string name="mtrl_chip_close_icon_content_description">%1$s контентін өшіру</string>
+  <string name="mtrl_chip_close_icon_content_description">%1$s мазмұнын өшіру</string>
 </resources>
diff --git a/material/java/com/google/android/material/chip/res/values-km/strings.xml b/material/java/com/google/android/material/chip/res/values-km/strings.xml
index 35258adeb..f8ed93996 100644
--- a/material/java/com/google/android/material/chip/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-kn/strings.xml b/material/java/com/google/android/material/chip/res/values-kn/strings.xml
index 2134d8814..5364da9e1 100644
--- a/material/java/com/google/android/material/chip/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ko/strings.xml b/material/java/com/google/android/material/chip/res/values-ko/strings.xml
index d5dc49660..c6af09a61 100644
--- a/material/java/com/google/android/material/chip/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ky/strings.xml b/material/java/com/google/android/material/chip/res/values-ky/strings.xml
index 4622df262..193690d41 100644
--- a/material/java/com/google/android/material/chip/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-lo/strings.xml b/material/java/com/google/android/material/chip/res/values-lo/strings.xml
index 51cb54e1d..8d279ddc8 100644
--- a/material/java/com/google/android/material/chip/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-lt/strings.xml b/material/java/com/google/android/material/chip/res/values-lt/strings.xml
index 340f81d93..15ea6558d 100644
--- a/material/java/com/google/android/material/chip/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-lv/strings.xml b/material/java/com/google/android/material/chip/res/values-lv/strings.xml
index 0ac18268c..876c68877 100644
--- a/material/java/com/google/android/material/chip/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-mk/strings.xml b/material/java/com/google/android/material/chip/res/values-mk/strings.xml
index e62135263..04e5d3e44 100644
--- a/material/java/com/google/android/material/chip/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ml/strings.xml b/material/java/com/google/android/material/chip/res/values-ml/strings.xml
index 05b16ce50..9020720d3 100644
--- a/material/java/com/google/android/material/chip/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-mn/strings.xml b/material/java/com/google/android/material/chip/res/values-mn/strings.xml
index d4f554dfa..7d0554e13 100644
--- a/material/java/com/google/android/material/chip/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-mr/strings.xml b/material/java/com/google/android/material/chip/res/values-mr/strings.xml
index 183997a2e..7a2d7abf8 100644
--- a/material/java/com/google/android/material/chip/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ms/strings.xml b/material/java/com/google/android/material/chip/res/values-ms/strings.xml
index b90721548..ecd434f6e 100644
--- a/material/java/com/google/android/material/chip/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-my/strings.xml b/material/java/com/google/android/material/chip/res/values-my/strings.xml
index 52b1069d3..62d72f540 100644
--- a/material/java/com/google/android/material/chip/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-nb/strings.xml b/material/java/com/google/android/material/chip/res/values-nb/strings.xml
index 4d1eeff40..a2c1e4c97 100644
--- a/material/java/com/google/android/material/chip/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ne/strings.xml b/material/java/com/google/android/material/chip/res/values-ne/strings.xml
index b64b983c9..82ed29c49 100644
--- a/material/java/com/google/android/material/chip/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-nl/strings.xml b/material/java/com/google/android/material/chip/res/values-nl/strings.xml
index 8af366f46..30cacb334 100644
--- a/material/java/com/google/android/material/chip/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-or/strings.xml b/material/java/com/google/android/material/chip/res/values-or/strings.xml
index 4bb974749..ce01615b3 100644
--- a/material/java/com/google/android/material/chip/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-pa/strings.xml b/material/java/com/google/android/material/chip/res/values-pa/strings.xml
index 509f1bb06..a34838fb0 100644
--- a/material/java/com/google/android/material/chip/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-pl/strings.xml b/material/java/com/google/android/material/chip/res/values-pl/strings.xml
index 92aaa45aa..e7fb06897 100644
--- a/material/java/com/google/android/material/chip/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/chip/res/values-pt-rBR/strings.xml
index 9a8a90bba..966084490 100644
--- a/material/java/com/google/android/material/chip/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/chip/res/values-pt-rPT/strings.xml
index 9a8a90bba..966084490 100644
--- a/material/java/com/google/android/material/chip/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ro/strings.xml b/material/java/com/google/android/material/chip/res/values-ro/strings.xml
index 837ca0217..a4ba2af7d 100644
--- a/material/java/com/google/android/material/chip/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ru/strings.xml b/material/java/com/google/android/material/chip/res/values-ru/strings.xml
index c0b81205a..08a3a4576 100644
--- a/material/java/com/google/android/material/chip/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-si/strings.xml b/material/java/com/google/android/material/chip/res/values-si/strings.xml
index a22ba3fdd..f98c68aa2 100644
--- a/material/java/com/google/android/material/chip/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-sk/strings.xml b/material/java/com/google/android/material/chip/res/values-sk/strings.xml
index 380b919b7..f959e756d 100644
--- a/material/java/com/google/android/material/chip/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-sl/strings.xml b/material/java/com/google/android/material/chip/res/values-sl/strings.xml
index 11c98ec82..1288ce2c5 100644
--- a/material/java/com/google/android/material/chip/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-sq/strings.xml b/material/java/com/google/android/material/chip/res/values-sq/strings.xml
index 2aed08d8a..fe9b47fda 100644
--- a/material/java/com/google/android/material/chip/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-sr/strings.xml b/material/java/com/google/android/material/chip/res/values-sr/strings.xml
index d000af043..f99bab8ca 100644
--- a/material/java/com/google/android/material/chip/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-sv/strings.xml b/material/java/com/google/android/material/chip/res/values-sv/strings.xml
index ca48205a7..dbf76d362 100644
--- a/material/java/com/google/android/material/chip/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-sw/strings.xml b/material/java/com/google/android/material/chip/res/values-sw/strings.xml
index 822f69106..c9590d6b7 100644
--- a/material/java/com/google/android/material/chip/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ta/strings.xml b/material/java/com/google/android/material/chip/res/values-ta/strings.xml
index dde7c95e4..8ff8f089f 100644
--- a/material/java/com/google/android/material/chip/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-te/strings.xml b/material/java/com/google/android/material/chip/res/values-te/strings.xml
index 6e3831715..3d04b7ec0 100644
--- a/material/java/com/google/android/material/chip/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-th/strings.xml b/material/java/com/google/android/material/chip/res/values-th/strings.xml
index 688aee082..4bee21121 100644
--- a/material/java/com/google/android/material/chip/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-tl/strings.xml b/material/java/com/google/android/material/chip/res/values-tl/strings.xml
index 56c206e86..091dff6d3 100644
--- a/material/java/com/google/android/material/chip/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-tr/strings.xml b/material/java/com/google/android/material/chip/res/values-tr/strings.xml
index a07bc6345..5b3515d87 100644
--- a/material/java/com/google/android/material/chip/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-uk/strings.xml b/material/java/com/google/android/material/chip/res/values-uk/strings.xml
index cb583c4b8..c29742906 100644
--- a/material/java/com/google/android/material/chip/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-ur/strings.xml b/material/java/com/google/android/material/chip/res/values-ur/strings.xml
index 19de23f10..36a3acdfb 100644
--- a/material/java/com/google/android/material/chip/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-uz/strings.xml b/material/java/com/google/android/material/chip/res/values-uz/strings.xml
index 2ca06e11f..2a24cb34e 100644
--- a/material/java/com/google/android/material/chip/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-v23/styles.xml b/material/java/com/google/android/material/chip/res/values-v23/styles.xml
deleted file mode 100644
index a7e008bd9..000000000
--- a/material/java/com/google/android/material/chip/res/values-v23/styles.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2021 The Android Open Source Project
-  ~
-  ~ 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.
--->
-<resources>
-
-  <style name="ThemeOverlay.Material3.Chip" parent="">
-    <!-- To tint vector drawables used as leading icons -->
-    <item name="colorControlNormal">@color/m3_chip_text_color</item>
-  </style>
-
-  <style name="ThemeOverlay.Material3.Chip.Assist" parent="">
-    <!-- To tint vector drawables used as leading icons -->
-    <item name="colorControlNormal">@color/m3_assist_chip_icon_tint_color</item>
-  </style>
-</resources>
diff --git a/material/java/com/google/android/material/chip/res/values-vi/strings.xml b/material/java/com/google/android/material/chip/res/values-vi/strings.xml
index 7773ac3b6..2c55186c9 100644
--- a/material/java/com/google/android/material/chip/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/chip/res/values-zh-rCN/strings.xml
index 05cba320d..85bfb61c0 100644
--- a/material/java/com/google/android/material/chip/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/chip/res/values-zh-rHK/strings.xml
index c7e84fbc3..d4552d529 100644
--- a/material/java/com/google/android/material/chip/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/chip/res/values-zh-rTW/strings.xml
index 12f83ee78..cad7d8bc8 100644
--- a/material/java/com/google/android/material/chip/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values-zu/strings.xml b/material/java/com/google/android/material/chip/res/values-zu/strings.xml
index 5de5a83dd..f4be7cfdf 100644
--- a/material/java/com/google/android/material/chip/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/chip/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/chip/res/values/styles.xml b/material/java/com/google/android/material/chip/res/values/styles.xml
index 71fdec641..de3d4faae 100644
--- a/material/java/com/google/android/material/chip/res/values/styles.xml
+++ b/material/java/com/google/android/material/chip/res/values/styles.xml
@@ -388,11 +388,11 @@
 
   <style name="ThemeOverlay.Material3.Chip" parent="">
     <!-- To tint vector drawables used as leading icons -->
-    <item name="colorControlNormal">?attr/colorOnSurfaceVariant</item>
+    <item name="colorControlNormal">@color/m3_chip_text_color</item>
   </style>
 
   <style name="ThemeOverlay.Material3.Chip.Assist" parent="">
     <!-- To tint vector drawables used as leading icons -->
-    <item name="colorControlNormal">?attr/colorPrimary</item>
+    <item name="colorControlNormal">@color/m3_assist_chip_icon_tint_color</item>
   </style>
 </resources>
diff --git a/material/java/com/google/android/material/color/DynamicColorsOptions.java b/material/java/com/google/android/material/color/DynamicColorsOptions.java
index d4c89716d..d2da926fd 100644
--- a/material/java/com/google/android/material/color/DynamicColorsOptions.java
+++ b/material/java/com/google/android/material/color/DynamicColorsOptions.java
@@ -20,7 +20,6 @@
 
 import android.app.Activity;
 import android.graphics.Bitmap;
-import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.RestrictTo;
@@ -62,10 +61,8 @@ private DynamicColorsOptions(Builder builder) {
     this.themeOverlay = builder.themeOverlay;
     this.precondition = builder.precondition;
     this.onAppliedCallback = builder.onAppliedCallback;
-    if (builder.contentBasedSourceColor != null) {
-      this.contentBasedSeedColor = builder.contentBasedSourceColor;
-    } else if (builder.contentBasedSourceBitmap != null) {
-      this.contentBasedSeedColor = extractSeedColorFromImage(builder.contentBasedSourceBitmap);
+    if (builder.contentBasedSource != null) {
+      this.contentBasedSeedColor = extractSeedColorFromImage(builder.contentBasedSource);
     }
   }
 
@@ -99,8 +96,7 @@ public static class Builder {
     @StyleRes private int themeOverlay;
     @NonNull private Precondition precondition = ALWAYS_ALLOW;
     @NonNull private OnAppliedCallback onAppliedCallback = NO_OP_CALLBACK;
-    @Nullable private Bitmap contentBasedSourceBitmap;
-    @Nullable private Integer contentBasedSourceColor;
+    @Nullable private Bitmap contentBasedSource;
 
     /** Sets the resource ID of the theme overlay that provides dynamic color definition. */
     @NonNull
@@ -128,8 +124,7 @@ public Builder setOnAppliedCallback(@NonNull OnAppliedCallback onAppliedCallback
 
     /**
      * Sets the content based source image to extract the seed color from to generate Material color
-     * palette. Calling this method will clear any source color previously set with
-     * #setContentBasedSource(int).
+     * palette.
      *
      * @hide
      */
@@ -137,23 +132,7 @@ public Builder setOnAppliedCallback(@NonNull OnAppliedCallback onAppliedCallback
     @NonNull
     @CanIgnoreReturnValue
     public Builder setContentBasedSource(@NonNull Bitmap contentBasedSource) {
-      this.contentBasedSourceBitmap = contentBasedSource;
-      this.contentBasedSourceColor = null;
-      return this;
-    }
-
-    /**
-     * Sets the content based source color to generate Material color palette. Calling this method
-     * will clear any source bitmap previously set with #setContentBasedSource(Bitmap).
-     *
-     * @hide
-     */
-    @RestrictTo(LIBRARY_GROUP)
-    @NonNull
-    @CanIgnoreReturnValue
-    public Builder setContentBasedSource(@ColorInt int contentBasedSource) {
-      this.contentBasedSourceBitmap = null;
-      this.contentBasedSourceColor = contentBasedSource;
+      this.contentBasedSource = contentBasedSource;
       return this;
     }
 
diff --git a/material/java/com/google/android/material/color/ThemeUtils.java b/material/java/com/google/android/material/color/ThemeUtils.java
index 10be154bf..f0073f4fb 100644
--- a/material/java/com/google/android/material/color/ThemeUtils.java
+++ b/material/java/com/google/android/material/color/ThemeUtils.java
@@ -16,8 +16,6 @@
 
 package com.google.android.material.color;
 
-import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
-
 import android.app.Activity;
 import android.content.Context;
 import android.content.res.Resources.Theme;
@@ -25,22 +23,14 @@
 import android.view.Window;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.annotation.RestrictTo;
 import androidx.annotation.StyleRes;
 
-// TODO(b/269781013): move this class to internal folder, which involves resolving cyclic dependency
-//           between color and internal folders
-/**
- * Utility methods for theme.
- *
- * @hide
- */
-@RestrictTo(LIBRARY_GROUP)
-public final class ThemeUtils {
+/** Utility methods for theme. */
+final class ThemeUtils {
 
   private ThemeUtils() {}
 
-  public static void applyThemeOverlay(@NonNull Context context, @StyleRes int theme) {
+  static void applyThemeOverlay(@NonNull Context context, @StyleRes int theme) {
     // Use applyStyle() instead of setTheme() due to Force Dark issue.
     context.getTheme().applyStyle(theme, /* force= */ true);
 
diff --git a/material/java/com/google/android/material/color/utilities/DynamicColor.java b/material/java/com/google/android/material/color/utilities/DynamicColor.java
index d89f5ffb6..d53672c73 100644
--- a/material/java/com/google/android/material/color/utilities/DynamicColor.java
+++ b/material/java/com/google/android/material/color/utilities/DynamicColor.java
@@ -302,21 +302,21 @@ public double getTone(DynamicScheme scheme) {
     double maxRatio = Contrast.RATIO_MAX;
     if (bgDynamicColor != null) {
       final boolean bgHasBg =
-          bgDynamicColor.background != null && bgDynamicColor.background.apply(scheme) == null;
+          bgDynamicColor.background != null && bgDynamicColor.background.apply(scheme) != null;
       final double standardRatio =
           Contrast.ratioOfTones(tone.apply(scheme), bgDynamicColor.tone.apply(scheme));
       if (decreasingContrast) {
         final double minContrastRatio =
             Contrast.ratioOfTones(
                 toneMinContrast.apply(scheme), bgDynamicColor.toneMinContrast.apply(scheme));
-        minRatio = bgHasBg ? 1.0 : minContrastRatio;
+        minRatio = bgHasBg ? minContrastRatio : 1.0;
         maxRatio = standardRatio;
       } else {
         final double maxContrastRatio =
             Contrast.ratioOfTones(
                 toneMaxContrast.apply(scheme), bgDynamicColor.toneMaxContrast.apply(scheme));
-        minRatio = !bgHasBg ? 1.0 : min(maxContrastRatio, standardRatio);
-        maxRatio = !bgHasBg ? 21.0 : max(maxContrastRatio, standardRatio);
+        minRatio = bgHasBg ? min(maxContrastRatio, standardRatio) : 1.0;
+        maxRatio = bgHasBg ? max(maxContrastRatio, standardRatio) : 21.0;
       }
     }
 
diff --git a/material/java/com/google/android/material/datepicker/DateSelector.java b/material/java/com/google/android/material/datepicker/DateSelector.java
index 649211130..5f473b1fa 100644
--- a/material/java/com/google/android/material/datepicker/DateSelector.java
+++ b/material/java/com/google/android/material/datepicker/DateSelector.java
@@ -146,12 +146,6 @@ static void showKeyboardWithAutoHideBehavior(@NonNull EditText... editTexts) {
       editText.setOnFocusChangeListener(listener);
     }
 
-    // TODO(b/246354286): Investigate issue with keyboard not showing on Android 12+
-    View viewToFocus = editTexts[0];
-    viewToFocus.postDelayed(
-        () ->
-            ViewUtils.requestFocusAndShowKeyboard(
-                viewToFocus, /* useWindowInsetsController= */ false),
-        100);
+    ViewUtils.requestFocusAndShowKeyboard(editTexts[0]);
   }
 }
diff --git a/material/java/com/google/android/material/datepicker/res/values-af/strings.xml b/material/java/com/google/android/material/datepicker/res/values-af/strings.xml
index e1abe733e..45010045f 100644
--- a/material/java/com/google/android/material/datepicker/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Skakel oor na teksinvoermodus</string>
   <string name="mtrl_picker_a11y_prev_month">Verander na vorige maand</string>
   <string name="mtrl_picker_a11y_next_month">Verander na volgende maand</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tik om na jaaraansig oor te skakel</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tik om na kalenderaansig oor te skakel</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tik om oor te skakel na die kies van \'n jaar</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tik om oor te skakel na die kies van \'n dag</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolom van dae: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Huidige keuse: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Keuse van begindatum: %1$s – Keuse van einddatum: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">geen</string>
-  <string name="mtrl_picker_navigate_to_year_description">Gaan na jaar %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Gaan na huidige jaar %1$d</string>
-  <string name="mtrl_picker_today_description">Vandag %1$s</string>
-  <string name="mtrl_picker_start_date_description">Begindatum %1$s</string>
-  <string name="mtrl_picker_end_date_description">Einddatum %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Gaan na jaar %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-am/strings.xml b/material/java/com/google/android/material/datepicker/res/values-am/strings.xml
index d6046ca2a..70328aba2 100644
--- a/material/java/com/google/android/material/datepicker/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ወደ ጽሁፍ ግቤት ሁነታ ቀይር</string>
   <string name="mtrl_picker_a11y_prev_month">ወደ ቀዳሚው ወር ቀይር</string>
   <string name="mtrl_picker_a11y_next_month">ወደ የሚቀጥለው ወር ቀይር</string>
-  <string name="mtrl_picker_toggle_to_year_selection">ወደ የዓመት እይታ ለመቀየር መታ ያድርጉ</string>
-  <string name="mtrl_picker_toggle_to_day_selection">ወደ የቀን መቁጠሪያ እይታ ለመቀየር መታ ያድርጉ</string>
+  <string name="mtrl_picker_toggle_to_year_selection">ወደ ዓመት መምረጥ ለመቀየር መታ ያድርጉ</string>
+  <string name="mtrl_picker_toggle_to_day_selection">ወደ ቀን መምረጥ ለመቀየር መታ ያድርጉ</string>
   <string name="mtrl_picker_day_of_week_column_header">የቀኖች ዓምድ፦ %1$s</string>
   <string name="mtrl_picker_announce_current_selection">የአሁኑ ምርጫ፦ %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">የመጀመሪያ ቀን ምርጫ፦ %1$s – የማብቂያ ቀን ምርጫ፦ %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ምንም</string>
-  <string name="mtrl_picker_navigate_to_year_description">ወደ ዓመት %1$d አሰስ</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ወደ የአሁኑ ዓመት %1$d አስስ</string>
-  <string name="mtrl_picker_today_description">ዛሬ %1$s</string>
-  <string name="mtrl_picker_start_date_description">የመጀመሪያ ቀን %1$s</string>
-  <string name="mtrl_picker_end_date_description">የማብቂያ ቀን %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">ወደ ዓመት %1$s አሰስ</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ar/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ar/strings.xml
index e3b993590..86abdbdf0 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">التبديل إلى وضع \"إدخال النص\"</string>
   <string name="mtrl_picker_a11y_prev_month">التغيير إلى الشهر السابق</string>
   <string name="mtrl_picker_a11y_next_month">التغيير إلى الشهر التالي</string>
-  <string name="mtrl_picker_toggle_to_year_selection">يمكنك النقر للتبديل إلى عرض السنة.</string>
-  <string name="mtrl_picker_toggle_to_day_selection">يمكنك النقر للتبديل إلى عرض \"تقويم Google\".</string>
+  <string name="mtrl_picker_toggle_to_year_selection">انقر للتبديل إلى اختيار عام</string>
+  <string name="mtrl_picker_toggle_to_day_selection">انقر للتبديل إلى اختيار يوم</string>
   <string name="mtrl_picker_day_of_week_column_header">عمود الأيام: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">الاختيار الحالي: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">اختيار تاريخ البدء: %1$s – اختيار تاريخ الانتهاء: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">بلا</string>
-  <string name="mtrl_picker_navigate_to_year_description">التنقل إلى العام %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">الانتقال إلى السنة الحالية %1$d</string>
-  <string name="mtrl_picker_today_description">اليوم %1$s</string>
-  <string name="mtrl_picker_start_date_description">تاريخ البدء: %1$s</string>
-  <string name="mtrl_picker_end_date_description">تاريخ الانتهاء: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">التنقل إلى العام %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-as/strings.xml b/material/java/com/google/android/material/datepicker/res/values-as/strings.xml
index faae50d35..c951f8980 100644
--- a/material/java/com/google/android/material/datepicker/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Switch to text input mode</string>
   <string name="mtrl_picker_a11y_prev_month">Change to previous month</string>
   <string name="mtrl_picker_a11y_next_month">Change to next month</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tap to switch to year view</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tap to switch to Calendar view</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tap to switch to selecting a year</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tap to switch to selecting a day</string>
   <string name="mtrl_picker_day_of_week_column_header">Column of days: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Current selection: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Start date selection: %1$s – End date selection: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">none</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navigate to year %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigate to current year %1$d</string>
-  <string name="mtrl_picker_today_description">Today %1$s</string>
-  <string name="mtrl_picker_start_date_description">Start date %1$s</string>
-  <string name="mtrl_picker_end_date_description">End date %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navigate to year %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-az/strings.xml b/material/java/com/google/android/material/datepicker/res/values-az/strings.xml
index f86947716..5a1217149 100644
--- a/material/java/com/google/android/material/datepicker/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Mətn daxiletmə rejiminə keçin</string>
   <string name="mtrl_picker_a11y_prev_month">Əvvəlki aya dəyişin</string>
   <string name="mtrl_picker_a11y_next_month">Növbəti aya dəyişin</string>
-  <string name="mtrl_picker_toggle_to_year_selection">İl görünüşünə keçirmək üçün toxunun</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Təqvim görünüşünə keçirmək üçün toxunun</string>
+  <string name="mtrl_picker_toggle_to_year_selection">İl seçiminə keçmək üçün toxunun</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Gün seçiminə keçmək üçün toxunun</string>
   <string name="mtrl_picker_day_of_week_column_header">Gün sütunu: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Cari seçim: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Başlama tarixi seçimi: %1$s – Bitmə tarixi seçimi: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">yoxdur</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d ilinə keçin</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Cari ilə keçin: %1$d</string>
-  <string name="mtrl_picker_today_description">Bugün: %1$s</string>
-  <string name="mtrl_picker_start_date_description">Başlama tarixi: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Bitmə tarixi: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s ilinə keçin</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/datepicker/res/values-b+es+419/strings.xml
index a3381cf48..db4ef368c 100644
--- a/material/java/com/google/android/material/datepicker/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Cambiar al modo de entrada de texto</string>
   <string name="mtrl_picker_a11y_prev_month">Cambiar al mes anterior</string>
   <string name="mtrl_picker_a11y_next_month">Cambiar al mes siguiente</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Presiona para cambiar a la vista de año</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Presiona para cambiar a la vista de Calendario</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Presiona para seleccionar un año</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Presiona para seleccionar un día</string>
   <string name="mtrl_picker_day_of_week_column_header">Columna de días: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Selección actual: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Selección de fecha de inicio: %1$s – Selección de fecha de finalización: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">nada</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navegar al año %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navegar al año actual (%1$d)</string>
-  <string name="mtrl_picker_today_description">Hoy, %1$s</string>
-  <string name="mtrl_picker_start_date_description">Fecha de inicio: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Fecha de finalización: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navegar al año %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/datepicker/res/values-b+sr+Latn/strings.xml
index 5e49763cf..d8b0691e5 100644
--- a/material/java/com/google/android/material/datepicker/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Pređite na režim unosa teksta</string>
   <string name="mtrl_picker_a11y_prev_month">Pređite na prethodni mesec</string>
   <string name="mtrl_picker_a11y_next_month">Pređite na sledeći mesec</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Dodirnite da biste prešli na prikaz godine</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Dodirnite da biste prešli na prikaz kalendara</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Dodirnite da biste prešli na izbor godine</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Dodirnite da biste prešli na izbor dana</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolona sa danima: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Aktuelni izbor: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Izbor datuma početka: %1$s – Izbor datuma završetka: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ništa</string>
-  <string name="mtrl_picker_navigate_to_year_description">Idite na godinu %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Idite na aktuelnu godinu %1$d</string>
-  <string name="mtrl_picker_today_description">Danas %1$s</string>
-  <string name="mtrl_picker_start_date_description">Datum početka %1$s</string>
-  <string name="mtrl_picker_end_date_description">Datum završetka %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Idite na godinu %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-be/strings.xml b/material/java/com/google/android/material/datepicker/res/values-be/strings.xml
index 2ed11f0a6..d50c69e28 100644
--- a/material/java/com/google/android/material/datepicker/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Пераключыцца ў рэжым уводу \"Тэкст\"</string>
   <string name="mtrl_picker_a11y_prev_month">Перайсці да папярэдняга месяца</string>
   <string name="mtrl_picker_a11y_next_month">Перайсці да наступнага месяца</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Націсніце, каб пераключыцца на агляд года</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Націсніце, каб пераключыцца на прагляд календара</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Дакраніцеся, каб пераключыцца на выбар года</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Дакраніцеся, каб пераключыцца на выбар дня</string>
   <string name="mtrl_picker_day_of_week_column_header">Слупок дзён: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Бягучае вылучэнне: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Выбраная дата пачатку: %1$s, выбраная дата заканчэння: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">не выбрана</string>
-  <string name="mtrl_picker_navigate_to_year_description">Перайсці ў %1$d год</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Перайсці да бягучага года %1$d</string>
-  <string name="mtrl_picker_today_description">Сёння %1$s</string>
-  <string name="mtrl_picker_start_date_description">Дата пачатку: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Дата заканчэння: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Перайсці ў %1$s год</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-bg/strings.xml b/material/java/com/google/android/material/datepicker/res/values-bg/strings.xml
index 2ef3315c3..238ad5a10 100644
--- a/material/java/com/google/android/material/datepicker/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Превключване към режим за въвеждане на текст</string>
   <string name="mtrl_picker_a11y_prev_month">Преминаване към предишния месец</string>
   <string name="mtrl_picker_a11y_next_month">Преминаване към следващия месец</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Докоснете за превключване към годишен изглед</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Докоснете за превключване към календарен изглед</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Докоснете, за да превключите към избиране на година</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Докоснете, за да превключите към избиране на ден</string>
   <string name="mtrl_picker_day_of_week_column_header">Колона за дни: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Текущ избор: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Избиране на начална дата: %1$s – Избиране на крайна дата: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">няма</string>
-  <string name="mtrl_picker_navigate_to_year_description">Навигиране до %1$d г.</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Навигиране до текущата година %1$d</string>
-  <string name="mtrl_picker_today_description">Днес – %1$s</string>
-  <string name="mtrl_picker_start_date_description">Начална дата: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Крайна дата: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Навигиране до %1$s г.</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-bn/strings.xml b/material/java/com/google/android/material/datepicker/res/values-bn/strings.xml
index 1059e4974..d3b939fe5 100644
--- a/material/java/com/google/android/material/datepicker/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">টেক্সট ইনপুট মোডে বদল করুন</string>
   <string name="mtrl_picker_a11y_prev_month">আগের মাসে যান</string>
   <string name="mtrl_picker_a11y_next_month">আগামী মাসে যান</string>
-  <string name="mtrl_picker_toggle_to_year_selection">বার্ষিক ভিউতে পাল্টাতে ট্যাপ করুন</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Calendar ভিউতে পাল্টাতে ট্যাপ করুন</string>
+  <string name="mtrl_picker_toggle_to_year_selection">বছর বেছে নেওয়ার মোডে বদল করতে ট্যাপ করুন</string>
+  <string name="mtrl_picker_toggle_to_day_selection">দিন বেছে নেওয়ার মোডে বদল করতে ট্যাপ করুন</string>
   <string name="mtrl_picker_day_of_week_column_header">সপ্তাহের দিনগুলির কলাম: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">বর্তমান বাছাই: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">চালু হওয়ার তারিখ বাছুন: %1$s – শেষ হওয়ার তারিখ বাছুন: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">কোনওটিই নয়</string>
-  <string name="mtrl_picker_navigate_to_year_description">নেভিগেট করে %1$d সালে যান</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">বর্তমান বছর %1$d-এ নেভিগেট করুন</string>
-  <string name="mtrl_picker_today_description">আজ %1$s</string>
-  <string name="mtrl_picker_start_date_description">শুরু হওয়ার তারিখ %1$s</string>
-  <string name="mtrl_picker_end_date_description">শেষ হওয়ার তারিখ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">নেভিগেট করে %1$s সালে যান</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-bs/strings.xml b/material/java/com/google/android/material/datepicker/res/values-bs/strings.xml
index eb279c4fa..196564c79 100644
--- a/material/java/com/google/android/material/datepicker/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Prebacivanje na način unosa teksta</string>
   <string name="mtrl_picker_a11y_prev_month">Promijeni na prethodni mjesec</string>
   <string name="mtrl_picker_a11y_next_month">Promijeni na sljedeći mjesec</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Prebacivanje dodirom na prikaz godine</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Prebacivanje dodirom na prikaz Kalendara</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Dodirnite da prebacite na odabir godine</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Dodirnite da prebacite na odabir dana</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolona za dane: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Trenutni izbor: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Odabir datuma početka: %1$s – Odabir datuma završetka: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ništa</string>
-  <string name="mtrl_picker_navigate_to_year_description">Odlazak na %1$d. godinu</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Odlazak na trenutnu godinu %1$d</string>
-  <string name="mtrl_picker_today_description">Danas %1$s</string>
-  <string name="mtrl_picker_start_date_description">Datum početka %1$s</string>
-  <string name="mtrl_picker_end_date_description">Datum završetka %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Odlazak na %1$s. godinu</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ca/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ca/strings.xml
index ee1ebed60..3a47a5172 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Canvia al mode d\'introducció de text</string>
   <string name="mtrl_picker_a11y_prev_month">Canvia al mes anterior</string>
   <string name="mtrl_picker_a11y_next_month">Canvia al mes següent</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Toca per canviar a la visualització d\'any</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Toca per canviar a la visualització de calendari</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Toca per canviar a la selecció de l\'any</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Toca per canviar a la selecció del dia</string>
   <string name="mtrl_picker_day_of_week_column_header">Columna de dies: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Selecció actual: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Selecció de la data d\'inici: %1$s – Selecció de la data de finalització: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">cap</string>
-  <string name="mtrl_picker_navigate_to_year_description">Canvia a l\'any %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navega fins a l\'any actual %1$d</string>
-  <string name="mtrl_picker_today_description">Avui, dia %1$s</string>
-  <string name="mtrl_picker_start_date_description">Data d\'inici: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data de finalització: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Canvia a l\'any %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-cs/strings.xml b/material/java/com/google/android/material/datepicker/res/values-cs/strings.xml
index c497ec7e8..d12b6998a 100644
--- a/material/java/com/google/android/material/datepicker/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Přepnout na režim zadávání textu</string>
   <string name="mtrl_picker_a11y_prev_month">Přejít na předchozí měsíc</string>
   <string name="mtrl_picker_a11y_next_month">Přejít na další měsíc</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Klepnutím přepnete na zobrazení jednotlivých let</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Klepnutím přepnete na zobrazení kalendáře</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Klepnutím přepnete na výběr roku</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Klepnutím přepnete na výběr dne</string>
   <string name="mtrl_picker_day_of_week_column_header">Sloupec dnů: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Aktuální výběr: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Výběr data zahájení: %1$s – Výběr data ukončení: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">prázdné</string>
-  <string name="mtrl_picker_navigate_to_year_description">Přejít na rok %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Přejít na aktuální rok %1$d</string>
-  <string name="mtrl_picker_today_description">Dnes %1$s</string>
-  <string name="mtrl_picker_start_date_description">Datum zahájení %1$s</string>
-  <string name="mtrl_picker_end_date_description">Datum ukončení %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Přejít na rok %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-da/strings.xml b/material/java/com/google/android/material/datepicker/res/values-da/strings.xml
index d7dd3a35f..bec23fe4b 100644
--- a/material/java/com/google/android/material/datepicker/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Skift til input-tilstand for tekst</string>
   <string name="mtrl_picker_a11y_prev_month">Skift til forrige måned</string>
   <string name="mtrl_picker_a11y_next_month">Skift til næste måned</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tryk for at skifte til årsvisning</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tryk for at skifte til kalendervisning</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tryk for at gå til valg af år</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tryk for at gå til valg af dag</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolonne med dage: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Aktuelt valg: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Valg af startdato: %1$s – Valg af slutdato: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ingen</string>
-  <string name="mtrl_picker_navigate_to_year_description">Gå til år %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Gå til indeværende år %1$d</string>
-  <string name="mtrl_picker_today_description">I dag %1$s</string>
-  <string name="mtrl_picker_start_date_description">Startdato %1$s</string>
-  <string name="mtrl_picker_end_date_description">Slutdato %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Gå til år %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-de/strings.xml b/material/java/com/google/android/material/datepicker/res/values-de/strings.xml
index 68bd7a402..8c6b30eb5 100644
--- a/material/java/com/google/android/material/datepicker/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">In den Texteingabemodus wechseln</string>
   <string name="mtrl_picker_a11y_prev_month">Zum vorherigen Monat wechseln</string>
   <string name="mtrl_picker_a11y_next_month">Zum nächsten Monat wechseln</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tippen, um zur Jahresansicht zu wechseln</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tippen, um zur Kalenderansicht zu wechseln</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tippen, um zur Jahresauswahl zu wechseln</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tippen, um zur Tagesauswahl zu wechseln</string>
   <string name="mtrl_picker_day_of_week_column_header">Spalte \"Wochentag\": %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Aktuelle Auswahl: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Ausgewähltes Startdatum: %1$s – Ausgewähltes Enddatum: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">Keines</string>
-  <string name="mtrl_picker_navigate_to_year_description">Zum Jahr %1$d wechseln</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Zum aktuellen Jahr %1$d wechseln</string>
-  <string name="mtrl_picker_today_description">Heute %1$s</string>
-  <string name="mtrl_picker_start_date_description">Startdatum %1$s</string>
-  <string name="mtrl_picker_end_date_description">Enddatum %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Zum Jahr %1$s wechseln</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-el/strings.xml b/material/java/com/google/android/material/datepicker/res/values-el/strings.xml
index 939fca519..8c6f3035d 100644
--- a/material/java/com/google/android/material/datepicker/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Εναλλαγή στη λειτουργία εισαγωγής κειμένου</string>
   <string name="mtrl_picker_a11y_prev_month">Αλλαγή στον προηγούμενο μήνα</string>
   <string name="mtrl_picker_a11y_next_month">Αλλαγή στον επόμενο μήνα</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Πατήστε για εναλλαγή στην προβολή έτους</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Πατήστε για εναλλαγή στην προβολή Ημερολόγιο</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Πατήστε για εναλλαγή για την επιλογή έτους</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Πατήστε για εναλλαγή για την επιλογή ημέρας</string>
   <string name="mtrl_picker_day_of_week_column_header">Στήλη ημερών: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Τρέχουσα επιλογή: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Επιλογή ημερομηνίας έναρξης: %1$s – Επιλογή ημερομηνίας λήξης: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">χωρίς επιλογή</string>
-  <string name="mtrl_picker_navigate_to_year_description">Πλοήγηση στο έτος %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Πλοήγηση στο τρέχον έτος %1$d</string>
-  <string name="mtrl_picker_today_description">Σήμερα %1$s</string>
-  <string name="mtrl_picker_start_date_description">Ημερομηνία έναρξης %1$s</string>
-  <string name="mtrl_picker_end_date_description">Ημερομηνία λήξης %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Πλοήγηση στο έτος %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/datepicker/res/values-en-rGB/strings.xml
index 03a200aea..275bfc31a 100644
--- a/material/java/com/google/android/material/datepicker/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Switch to text input mode</string>
   <string name="mtrl_picker_a11y_prev_month">Change to previous month</string>
   <string name="mtrl_picker_a11y_next_month">Change to next month</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tap to switch to year view</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tap to switch to calendar view</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tap to switch to selecting a year</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tap to switch to selecting a day</string>
   <string name="mtrl_picker_day_of_week_column_header">Column of days: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Current selection: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Start date selection: %1$s – end date selection: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">none</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navigate to year %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigate to current year %1$d</string>
-  <string name="mtrl_picker_today_description">Today %1$s</string>
-  <string name="mtrl_picker_start_date_description">Start date %1$s</string>
-  <string name="mtrl_picker_end_date_description">End date %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navigate to year %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/datepicker/res/values-es-rUS/strings.xml
index a3381cf48..db4ef368c 100644
--- a/material/java/com/google/android/material/datepicker/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Cambiar al modo de entrada de texto</string>
   <string name="mtrl_picker_a11y_prev_month">Cambiar al mes anterior</string>
   <string name="mtrl_picker_a11y_next_month">Cambiar al mes siguiente</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Presiona para cambiar a la vista de año</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Presiona para cambiar a la vista de Calendario</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Presiona para seleccionar un año</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Presiona para seleccionar un día</string>
   <string name="mtrl_picker_day_of_week_column_header">Columna de días: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Selección actual: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Selección de fecha de inicio: %1$s – Selección de fecha de finalización: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">nada</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navegar al año %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navegar al año actual (%1$d)</string>
-  <string name="mtrl_picker_today_description">Hoy, %1$s</string>
-  <string name="mtrl_picker_start_date_description">Fecha de inicio: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Fecha de finalización: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navegar al año %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-es/strings.xml b/material/java/com/google/android/material/datepicker/res/values-es/strings.xml
index b7330b01a..cea54b9c5 100644
--- a/material/java/com/google/android/material/datepicker/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Cambiar al modo de introducción Texto</string>
   <string name="mtrl_picker_a11y_prev_month">Cambiar al mes anterior</string>
   <string name="mtrl_picker_a11y_next_month">Cambiar al mes siguiente</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Toca para cambiar a la vista de año</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Toca para cambiar a la vista de calendario</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Toca para seleccionar un año</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Toca para seleccionar un día</string>
   <string name="mtrl_picker_day_of_week_column_header">Columna de días: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Selección actual: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Selección de fecha de inicio: %1$s – Selección de fecha de finalización: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ninguna</string>
-  <string name="mtrl_picker_navigate_to_year_description">Ir al año %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Ir al año actual, %1$d</string>
-  <string name="mtrl_picker_today_description">Hoy, %1$s</string>
-  <string name="mtrl_picker_start_date_description">Fecha de inicio: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Fecha de finalización: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Ir al año %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-et/strings.xml b/material/java/com/google/android/material/datepicker/res/values-et/strings.xml
index 18ff84b8e..a5ea0fa3f 100644
--- a/material/java/com/google/android/material/datepicker/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Lülitu tekstisisestusrežiimile</string>
   <string name="mtrl_picker_a11y_prev_month">Vaheta eelmisele kuule</string>
   <string name="mtrl_picker_a11y_next_month">Vaheta järgmisele kuule</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Puudutage aastavaatele lülitumiseks</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Puudutage kalendrivaatele lülitumiseks</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Puudutage, et lülituda aasta valimisele</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Puudutage, et lülituda päeva valimisele</string>
   <string name="mtrl_picker_day_of_week_column_header">Päevade veerg: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Praegune valik: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Alguskuupäeva valik: %1$s. Lõppkuupäeva valik: %2$s.</string>
-  <string name="mtrl_picker_announce_current_selection_none">puudub</string>
-  <string name="mtrl_picker_navigate_to_year_description">Mine aastasse %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigeerige praegusele aastale %1$d</string>
-  <string name="mtrl_picker_today_description">Täna %1$s</string>
-  <string name="mtrl_picker_start_date_description">Alguskuupäev: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Lõppkuupäev: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Mine aastasse %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-eu/strings.xml b/material/java/com/google/android/material/datepicker/res/values-eu/strings.xml
index a89dadd58..324e44de3 100644
--- a/material/java/com/google/android/material/datepicker/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Aldatu testua idazteko modura</string>
   <string name="mtrl_picker_a11y_prev_month">Aldatu aurreko hilabetera</string>
   <string name="mtrl_picker_a11y_next_month">Aldatu hurrengo hilabetera</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Urteko ikuspegira aldatzeko, sakatu hau</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Calendar-en ikuspegira aldatzeko, sakatu hau</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Sakatu urtea hautatzeko modura aldatzeko</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Sakatu eguna hautatzeko modura aldatzeko</string>
   <string name="mtrl_picker_day_of_week_column_header">Egunen zutabea:%1$s</string>
   <string name="mtrl_picker_announce_current_selection">Oraingo hautapena: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Hasiera-dataren hautapena: %1$s, amaiera-dataren hautapena: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">bat ere ez</string>
-  <string name="mtrl_picker_navigate_to_year_description">Joan %1$d. urtera</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Joan aurtengo ikuspegira %1$d</string>
-  <string name="mtrl_picker_today_description">Gaur %1$s</string>
-  <string name="mtrl_picker_start_date_description">Hasiera-data: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Amaiera-data: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Joan %1$s. urtera</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-fa/strings.xml b/material/java/com/google/android/material/datepicker/res/values-fa/strings.xml
index 945a64a19..62c057eb8 100644
--- a/material/java/com/google/android/material/datepicker/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">رفتن به حالت ورودی نوشتاری</string>
   <string name="mtrl_picker_a11y_prev_month">تغییر به ماه قبلی</string>
   <string name="mtrl_picker_a11y_next_month">تغییر به ماه بعدی</string>
-  <string name="mtrl_picker_toggle_to_year_selection">برای رفتن به نمای سال ضربه بزنید</string>
-  <string name="mtrl_picker_toggle_to_day_selection">برای رفتن به نمای «تقویم» ضربه بزنید</string>
+  <string name="mtrl_picker_toggle_to_year_selection">برای رفتن به حالت انتخاب سال ضربه بزنید</string>
+  <string name="mtrl_picker_toggle_to_day_selection">رفتن به رفتن به حالت انتخاب روز ضربه بزنید</string>
   <string name="mtrl_picker_day_of_week_column_header">ستون روز: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">انتخاب کنونی: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">تاریخ شروع انتخاب‌شده: %1$s – تاریخ پایان انتخاب‌شده: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">خالی</string>
-  <string name="mtrl_picker_navigate_to_year_description">رفتن به سال %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">پیمایش به سال فعلی %1$d</string>
-  <string name="mtrl_picker_today_description">امروز %1$s</string>
-  <string name="mtrl_picker_start_date_description">تاریخ شروع: %1$s</string>
-  <string name="mtrl_picker_end_date_description">تاریخ پایان: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">رفتن به سال %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-fi/strings.xml b/material/java/com/google/android/material/datepicker/res/values-fi/strings.xml
index 5d98cdadc..bcb83a2ea 100644
--- a/material/java/com/google/android/material/datepicker/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Valitse syöttötavaksi teksti</string>
   <string name="mtrl_picker_a11y_prev_month">Vaihda edelliseen kuukauteen</string>
   <string name="mtrl_picker_a11y_next_month">Vaihda seuraavaan kuukauteen</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Siirry vuosinäkymään napauttamalla</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Siirry kalenterinäkymään napauttamalla</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Siirry vuoden valintaan napauttamalla</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Siirry päivän valintaan napauttamalla</string>
   <string name="mtrl_picker_day_of_week_column_header">Päiväsarake: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Nykyinen valinta: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Alkamispäivän valinta: %1$s – päättymispäivän valinta: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">–</string>
-  <string name="mtrl_picker_navigate_to_year_description">Siirry vuoteen %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Siirry kuluvaan vuoteen: %1$d</string>
-  <string name="mtrl_picker_today_description">Tänään: %1$s</string>
-  <string name="mtrl_picker_start_date_description">Alkaa %1$s</string>
-  <string name="mtrl_picker_end_date_description">Päättyy %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Siirry vuoteen %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/datepicker/res/values-fr-rCA/strings.xml
index 92e42b667..dba0ed09a 100644
--- a/material/java/com/google/android/material/datepicker/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Passer au mode d\'entrée Texte</string>
   <string name="mtrl_picker_a11y_prev_month">Passer au mois précédent</string>
   <string name="mtrl_picker_a11y_next_month">Passer au mois suivant</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Toucher pour passer à la vue de l\'année</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Toucher pour passer à la vue du calendrier</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Touchez pour passer à la sélection d\'année</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Touchez pour passer à la sélection de jour</string>
   <string name="mtrl_picker_day_of_week_column_header">Colonne des jours : %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Sélection actuelle : %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Sélection de la date de début : %1$s – Sélection de la date de fin : %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">aucune</string>
-  <string name="mtrl_picker_navigate_to_year_description">Naviguer vers l\'année %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Naviguer à l\'année en cours %1$d</string>
-  <string name="mtrl_picker_today_description">%1$s Aujourd\'hui</string>
-  <string name="mtrl_picker_start_date_description">Date de début : %1$s</string>
-  <string name="mtrl_picker_end_date_description">Date de fin : %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Naviguer vers l\'année %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-fr/strings.xml b/material/java/com/google/android/material/datepicker/res/values-fr/strings.xml
index 06c6e2736..be38486e7 100644
--- a/material/java/com/google/android/material/datepicker/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Passer au mode de saisie Texte</string>
   <string name="mtrl_picker_a11y_prev_month">Passer au mois précédent</string>
   <string name="mtrl_picker_a11y_next_month">Passer au mois suivant</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Appuyer pour passer à la vue \"Année\"</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Appuyer pour passer à la vue \"Agenda\"</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Appuyer pour sélectionner une année</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Appuyer pour sélectionner un jour</string>
   <string name="mtrl_picker_day_of_week_column_header">Colonne du jour de la semaine : %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Sélection actuelle : %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Date de début sélectionnée : %1$s – Date de fin sélectionnée : %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">aucune</string>
-  <string name="mtrl_picker_navigate_to_year_description">Accéder à l\'année %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Accéder à l\'année en cours : %1$d</string>
-  <string name="mtrl_picker_today_description">Aujourd\'hui : %1$s</string>
-  <string name="mtrl_picker_start_date_description">Date de début : %1$s</string>
-  <string name="mtrl_picker_end_date_description">Date de fin : %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Accéder à l\'année %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-gl/strings.xml b/material/java/com/google/android/material/datepicker/res/values-gl/strings.xml
index 4afe59339..72d6393b7 100644
--- a/material/java/com/google/android/material/datepicker/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Cambiar ao modo de introdución de texto</string>
   <string name="mtrl_picker_a11y_prev_month">Cambiar ao mes anterior</string>
   <string name="mtrl_picker_a11y_next_month">Cambiar ao mes seguinte</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tocar para cambiar á vista de ano</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tocar para cambiar á vista de calendario</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tocar para cambiar a selección de ano</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tocar para cambiar a selección de día</string>
   <string name="mtrl_picker_day_of_week_column_header">Columna de días: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Selección actual: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Selección de data de inicio: %1$s - Selección de data de finalización: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ningunha</string>
-  <string name="mtrl_picker_navigate_to_year_description">Ir ao ano %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Ir ao ano actual (%1$d)</string>
-  <string name="mtrl_picker_today_description">Hoxe (%1$s)</string>
-  <string name="mtrl_picker_start_date_description">Data de inicio: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data de finalización: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Ir ao ano %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-gu/strings.xml b/material/java/com/google/android/material/datepicker/res/values-gu/strings.xml
index 266d46048..508d8df9f 100644
--- a/material/java/com/google/android/material/datepicker/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ટેક્સ્ટ ઇનપુટ મોડ પર સ્વિચ કરો</string>
   <string name="mtrl_picker_a11y_prev_month">પાછલા મહિના પર બદલો</string>
   <string name="mtrl_picker_a11y_next_month">આગલા મહિના પર બદલો</string>
-  <string name="mtrl_picker_toggle_to_year_selection">વર્ષ વ્યૂ પર સ્વિચ કરવા માટે ટૅપ કરો</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Calendar વ્યૂ પર સ્વિચ કરવા માટે ટૅપ કરો</string>
+  <string name="mtrl_picker_toggle_to_year_selection">વર્ષની પસંદગી પર સ્વિચ કરવા માટે ટૅપ કરો</string>
+  <string name="mtrl_picker_toggle_to_day_selection">દિવસની પસંદગી પર સ્વિચ કરવા માટે ટૅપ કરો</string>
   <string name="mtrl_picker_day_of_week_column_header">દિવસોની કૉલમ: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">હાલની પસંદગી: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">પ્રારંભ તારીખની પસંદગી: %1$s – સમાપ્તિ તારીખની પસંદગી: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">કોઈ નહીં</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$dના વર્ષ પર નૅવિગેટ કરો</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ચાલુ વર્ષ %1$d પર નૅવિગેટ કરો</string>
-  <string name="mtrl_picker_today_description">આજે %1$s</string>
-  <string name="mtrl_picker_start_date_description">પ્રારંભ તારીખ %1$s</string>
-  <string name="mtrl_picker_end_date_description">સમાપ્તિ તારીખ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$sના વર્ષ પર નૅવિગેટ કરો</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-hi/strings.xml b/material/java/com/google/android/material/datepicker/res/values-hi/strings.xml
index ced40a265..488f16da2 100644
--- a/material/java/com/google/android/material/datepicker/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
   <string name="mtrl_picker_text_input_day_abbr">d</string>
   <string name="mtrl_picker_save">सेव करें</string>
   <string name="mtrl_picker_invalid_range">तारीखों की अमान्य सीमा.</string>
-  <string name="mtrl_picker_out_of_range">चुनी गई तारीख मान्य नहीं है: %1$s</string>
+  <string name="mtrl_picker_out_of_range">तारीख की मान्य सीमा से बाहर: %1$s</string>
   <string name="mtrl_picker_invalid_format">गलत फ़ॉर्मैट.</string>
   <string name="mtrl_picker_invalid_format_use">%1$s का इस्तेमाल करें</string>
   <string name="mtrl_picker_invalid_format_example">उदाहरण: %1$s</string>
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">टेक्स्ट के इनपुट मोड पर स्विच करें</string>
   <string name="mtrl_picker_a11y_prev_month">पिछले महीने पर जाएं</string>
   <string name="mtrl_picker_a11y_next_month">अगले महीने पर जाएं</string>
-  <string name="mtrl_picker_toggle_to_year_selection">साल के व्यू पर स्विच करने के लिए टैप करें</string>
-  <string name="mtrl_picker_toggle_to_day_selection">कैलेंडर के व्यू पर स्विच करने के लिए टैप करें</string>
+  <string name="mtrl_picker_toggle_to_year_selection">\'साल चुनना\' पर स्विच करने के लिए टैप करें</string>
+  <string name="mtrl_picker_toggle_to_day_selection">\'दिन चुनना\' पर स्विच करने के लिए टैप करें</string>
   <string name="mtrl_picker_day_of_week_column_header">दिनों का कॉलम: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">फ़िलहाल, यह चुना गया है: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">शुरू होने की तारीख चुनें: %1$s – खत्म होने की तारीख चुनें: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">कोई भी तारीख नहीं चुनी गई</string>
-  <string name="mtrl_picker_navigate_to_year_description">साल %1$d पर जाएं</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">मौजूदा साल %1$d पर जाएं</string>
-  <string name="mtrl_picker_today_description">आज %1$s</string>
-  <string name="mtrl_picker_start_date_description">शुरू होने की तारीख %1$s</string>
-  <string name="mtrl_picker_end_date_description">खत्म होने की तारीख %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">साल %1$s पर जाएं</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-hr/strings.xml b/material/java/com/google/android/material/datepicker/res/values-hr/strings.xml
index e1aadbd76..658d6a31e 100644
--- a/material/java/com/google/android/material/datepicker/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Prijelaz na način unosa teksta</string>
   <string name="mtrl_picker_a11y_prev_month">Pomicanje na prethodni mjesec</string>
   <string name="mtrl_picker_a11y_next_month">Prijelaz na sljedeći mjesec</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Dodirnite da biste se prebacili na prikaz godine</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Dodirnite da biste se prebacili na prikaz kalendara</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Dodirnite za prijelaz na odabir godine</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Dodirnite za prijelaz na odabir dana</string>
   <string name="mtrl_picker_day_of_week_column_header">Stupac s danima: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Trenutačan odabir: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Odabir datuma početka: %1$s – odabir datuma završetka: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ništa</string>
-  <string name="mtrl_picker_navigate_to_year_description">Prijelaz na godinu %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Idi na trenutačnu godinu %1$d</string>
-  <string name="mtrl_picker_today_description">Danas: %1$s</string>
-  <string name="mtrl_picker_start_date_description">Datum početka %1$s</string>
-  <string name="mtrl_picker_end_date_description">Datum završetka %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Prijelaz na godinu %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-hu/strings.xml b/material/java/com/google/android/material/datepicker/res/values-hu/strings.xml
index fa11ef7c2..efff3045c 100644
--- a/material/java/com/google/android/material/datepicker/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Váltás szövegbeviteli módra</string>
   <string name="mtrl_picker_a11y_prev_month">Váltás az előző hónapra</string>
   <string name="mtrl_picker_a11y_next_month">Váltás a következő hónapra</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Koppintson az éves nézetre való váltáshoz</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Koppintson a naptárnézetre való váltáshoz</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Koppintson az év kiválasztásához</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Koppintson a nap kiválasztásához</string>
   <string name="mtrl_picker_day_of_week_column_header">Napok oszlopa: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Jelenleg kiválasztva: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Kiválasztott kezdő dátum: %1$s – Kiválasztott befejező dátum: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">egyik sem</string>
-  <string name="mtrl_picker_navigate_to_year_description">Ugrás ehhez az évhez: %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Ugrás az aktuális évre %1$d</string>
-  <string name="mtrl_picker_today_description">Ma %1$s</string>
-  <string name="mtrl_picker_start_date_description">Kezdés dátuma: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Befejezés dátuma: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Ugrás ehhez az évhez: %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-hy/strings.xml b/material/java/com/google/android/material/datepicker/res/values-hy/strings.xml
index 6b4fd8462..8aa3d262b 100644
--- a/material/java/com/google/android/material/datepicker/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <string name="mtrl_picker_range_header_only_start_selected">%1$s – Ավարտի ամսաթիվը</string>
   <string name="mtrl_picker_range_header_only_end_selected">Մեկնարկի ամսաթիվը – %1$s</string>
   <string name="mtrl_picker_range_header_selected">%1$s – %2$s</string>
-  <string name="mtrl_picker_date_header_unselected">Ընտրված ամսաթիվ</string>
+  <string name="mtrl_picker_date_header_unselected">Ընտրված ամսաթիվը</string>
   <string name="mtrl_picker_date_header_selected">%1$s</string>
   <string name="mtrl_picker_confirm">Եղավ</string>
   <string name="mtrl_picker_cancel">Չեղարկել</string>
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Անցնել տեքստի մուտքագրման ռեժիմին</string>
   <string name="mtrl_picker_a11y_prev_month">Անցնել նախորդ ամիս</string>
   <string name="mtrl_picker_a11y_next_month">Անցնել հաջորդ ամիս</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Հպեք՝ տարվա դիտակերպին անցնելու համար</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Հպեք՝ Օրացույցի դիտակերպին անցնելու համար</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Հպեք՝ տարեթվի ընտությանն անցնելու համար</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Հպեք՝ օրվա ընտությանն անցնելու համար</string>
   <string name="mtrl_picker_day_of_week_column_header">Օրերի սյունակ՝ %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Ներկայիս ընտրությունը՝ %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Մեկնարկի ամսաթվի ընտրություն՝ %1$s – Ավարտի ամսաթվի ընտրություն՝ %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ոչ մեկը</string>
-  <string name="mtrl_picker_navigate_to_year_description">Անցնել %1$d թվական</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Անցնել ընթացիկ տարվան (%1$d)</string>
-  <string name="mtrl_picker_today_description">Այսօր (%1$s)</string>
-  <string name="mtrl_picker_start_date_description">Սկզբի ամսաթիվը՝ %1$s</string>
-  <string name="mtrl_picker_end_date_description">Ավարտի ամսաթիվը՝ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Անցնել %1$s թվական</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-in/strings.xml b/material/java/com/google/android/material/datepicker/res/values-in/strings.xml
index 7e1bcaf35..e61258355 100644
--- a/material/java/com/google/android/material/datepicker/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Beralih ke mode masukan teks</string>
   <string name="mtrl_picker_a11y_prev_month">Ubah ke bulan sebelumnya</string>
   <string name="mtrl_picker_a11y_next_month">Ubah ke bulan berikutnya</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Ketuk untuk beralih ke tampilan tahun</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Ketuk untuk beralih ke tampilan Kalender</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Ketuk untuk beralih ke memilih tahun</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Ketuk untuk beralih ke memilih hari</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolom hari: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Pilihan saat ini: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Pemilihan tanggal mulai: %1$s – Pemilihan tanggal akhir: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">tidak ada</string>
-  <string name="mtrl_picker_navigate_to_year_description">Buka tahun %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Pilih tahun ini %1$d</string>
-  <string name="mtrl_picker_today_description">Hari ini %1$s</string>
-  <string name="mtrl_picker_start_date_description">Tanggal mulai %1$s</string>
-  <string name="mtrl_picker_end_date_description">Tanggal akhir %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Buka tahun %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-is/strings.xml b/material/java/com/google/android/material/datepicker/res/values-is/strings.xml
index db051b7c4..cc1f2250e 100644
--- a/material/java/com/google/android/material/datepicker/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Skipta yfir í innfærsluaðferð fyrir texta</string>
   <string name="mtrl_picker_a11y_prev_month">Breyta í fyrri mánuð</string>
   <string name="mtrl_picker_a11y_next_month">Breyta í næsta mánuð</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Ýttu til að skipta yfir í ársyfirlit</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Ýttu til að skipta yfir í dagatalsyfirlit</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Ýttu til að skipta yfir í að velja ár</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Ýttu til að skipta yfir í að velja dag</string>
   <string name="mtrl_picker_day_of_week_column_header">Dálkur með dögum: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Núverandi val: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Val upphafsdags: %1$s – Val lokadags: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ekkert</string>
-  <string name="mtrl_picker_navigate_to_year_description">Fara í árið %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Fara á núverandi ár %1$d</string>
-  <string name="mtrl_picker_today_description">Í dag %1$s</string>
-  <string name="mtrl_picker_start_date_description">Upphafsdagur %1$s</string>
-  <string name="mtrl_picker_end_date_description">Lokadagur %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Fara í árið %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-it/strings.xml b/material/java/com/google/android/material/datepicker/res/values-it/strings.xml
index 5010d853f..b969362b7 100644
--- a/material/java/com/google/android/material/datepicker/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Passa alla modalità di immissione Testo</string>
   <string name="mtrl_picker_a11y_prev_month">Passa al mese precedente</string>
   <string name="mtrl_picker_a11y_next_month">Passa al mese successivo</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tocca per passare alla visualizzazione Anno</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tocca per passare alla visualizzazione Calendario</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tocca per passare alla selezione di un anno</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tocca per passare alla selezione di un giorno</string>
   <string name="mtrl_picker_day_of_week_column_header">Colonna dei giorni: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Selezione attuale: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Selezione della data di inizio: %1$s. Selezione della data di fine: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">Nessuna selezione</string>
-  <string name="mtrl_picker_navigate_to_year_description">Vai all\'anno %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Vai all\'anno corrente %1$d</string>
-  <string name="mtrl_picker_today_description">Oggi %1$s</string>
-  <string name="mtrl_picker_start_date_description">Data di inizio: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data di fine: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Vai all\'anno %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-iw/strings.xml b/material/java/com/google/android/material/datepicker/res/values-iw/strings.xml
index 6c7b30129..3e0543159 100644
--- a/material/java/com/google/android/material/datepicker/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">החלפה לשיטת קלט של טקסט</string>
   <string name="mtrl_picker_a11y_prev_month">מעבר לחודש הקודם</string>
   <string name="mtrl_picker_a11y_next_month">מעבר לחודש הבא</string>
-  <string name="mtrl_picker_toggle_to_year_selection">יש להקיש כדי לעבור לתצוגת שנתית</string>
-  <string name="mtrl_picker_toggle_to_day_selection">יש להקיש כדי לעבור לתצוגת יומן</string>
+  <string name="mtrl_picker_toggle_to_year_selection">יש להקיש כדי להחליף לבחירת שנה</string>
+  <string name="mtrl_picker_toggle_to_day_selection">יש להקיש כדי להחליף לבחירת יום</string>
   <string name="mtrl_picker_day_of_week_column_header">עמודה של ימים: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">הבחירה הנוכחית: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">בחירת תאריך ההתחלה: %1$s – בחירת תאריך הסיום: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ללא</string>
-  <string name="mtrl_picker_navigate_to_year_description">ניווט לשנת %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ניווט לשנה הנוכחית %1$d</string>
-  <string name="mtrl_picker_today_description">היום %1$s</string>
-  <string name="mtrl_picker_start_date_description">תאריך ההתחלה %1$s</string>
-  <string name="mtrl_picker_end_date_description">תאריך הסיום %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">ניווט לשנת %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ja/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ja/strings.xml
index 41ec132d3..1c585431b 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">テキスト入力モードに切り替え</string>
   <string name="mtrl_picker_a11y_prev_month">前月に変更</string>
   <string name="mtrl_picker_a11y_next_month">翌月に変更</string>
-  <string name="mtrl_picker_toggle_to_year_selection">タップすると年表示に切り替わります</string>
-  <string name="mtrl_picker_toggle_to_day_selection">タップするとカレンダー表示に切り替わります</string>
+  <string name="mtrl_picker_toggle_to_year_selection">タップすると、年の選択に切り替わります</string>
+  <string name="mtrl_picker_toggle_to_day_selection">タップすると、日の選択に切り替わります</string>
   <string name="mtrl_picker_day_of_week_column_header">曜日の列: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">現在の選択: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">開始日の選択: %1$s – 終了日の選択: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">なし</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d 年に移動</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">現在の年（%1$d）に移動</string>
-  <string name="mtrl_picker_today_description">今日（%1$s）</string>
-  <string name="mtrl_picker_start_date_description">開始日 %1$s</string>
-  <string name="mtrl_picker_end_date_description">終了日 %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s 年に移動</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ka/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ka/strings.xml
index b12260315..205e42d66 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ტექსტის შეყვანის რეჟიმზე გადართვა</string>
   <string name="mtrl_picker_a11y_prev_month">წინა თვეზე გადასვლა</string>
   <string name="mtrl_picker_a11y_next_month">შემდეგ თვეზე გადასვლა</string>
-  <string name="mtrl_picker_toggle_to_year_selection">შეეხეთ წლის ხედზე გადასართავად</string>
-  <string name="mtrl_picker_toggle_to_day_selection">შეეხეთ კალენდრის ხედზე გადასართავად</string>
+  <string name="mtrl_picker_toggle_to_year_selection">შეეხეთ წლის არჩევაზე გადასართავად</string>
+  <string name="mtrl_picker_toggle_to_day_selection">შეეხეთ დღის არჩევაზე გადასართავად</string>
   <string name="mtrl_picker_day_of_week_column_header">დღეების სვეტი: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">ამჟამინდელი არჩევანი: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">დაწყების თარიღის შერჩევა: %1$s – დასრულების თარიღის შერჩევა: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">არცერთი</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d წელზე ნავიგაცია</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ნავიგაცია მიმდინარე წელზე (%1$d)</string>
-  <string name="mtrl_picker_today_description">დღეს (%1$s)</string>
-  <string name="mtrl_picker_start_date_description">დაწყების თარიღი %1$s</string>
-  <string name="mtrl_picker_end_date_description">დასრულების თარიღი %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s წელზე ნავიგაცია</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-kk/strings.xml b/material/java/com/google/android/material/datepicker/res/values-kk/strings.xml
index aeace3c28..1600547b3 100644
--- a/material/java/com/google/android/material/datepicker/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Мәтін енгізу режиміне ауысу</string>
   <string name="mtrl_picker_a11y_prev_month">Алдыңғы айға өту</string>
   <string name="mtrl_picker_a11y_next_month">Келесі айға өту</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Жыл бойынша көрсету үшін түртіңіз.</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Күнтізбе бойынша көрсету үшін түртіңіз.</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Жылды таңдауға ауысу үшін түртіңіз.</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Күнді таңдауға ауысу үшін түртіңіз.</string>
   <string name="mtrl_picker_day_of_week_column_header">Күндер бағаны: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Ағымдағы таңдау: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Таңдалған басталу уақыты: %1$s – Таңдалған аяқталу уақыты: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ешқандай</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d жылына жылжу</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Қазіргі жылға өту %1$d</string>
-  <string name="mtrl_picker_today_description">Бүгін %1$s</string>
-  <string name="mtrl_picker_start_date_description">Басталу күні: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Аяқталу күні: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s жылына жылжу</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-km/strings.xml b/material/java/com/google/android/material/datepicker/res/values-km/strings.xml
index 0cc180da4..e4c57ca12 100644
--- a/material/java/com/google/android/material/datepicker/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
   <string name="mtrl_picker_text_input_day_abbr">ថ</string>
   <string name="mtrl_picker_save">រក្សាទុក</string>
   <string name="mtrl_picker_invalid_range">ជួរ​មិនត្រឹមត្រូវទេ។</string>
-  <string name="mtrl_picker_out_of_range">នៅក្រៅ​ចន្លោះ៖ %1$s</string>
+  <string name="mtrl_picker_out_of_range">នៅក្រៅ​ជួរ៖ %1$s</string>
   <string name="mtrl_picker_invalid_format">ទម្រង់មិន​ត្រឹមត្រូវទេ។</string>
   <string name="mtrl_picker_invalid_format_use">ប្រើ៖ %1$s</string>
   <string name="mtrl_picker_invalid_format_example">ឧទាហរណ៍៖ %1$s</string>
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ប្ដូរទៅ​របៀប​បញ្ចូល​អក្សរ</string>
   <string name="mtrl_picker_a11y_prev_month">ប្ដូរ​ទៅ​ខែមុន</string>
   <string name="mtrl_picker_a11y_next_month">ប្ដូរ​ទៅ​ខែបន្ទាប់</string>
-  <string name="mtrl_picker_toggle_to_year_selection">ចុច ដើម្បីប្ដូរទៅទិដ្ឋភាពឆ្នាំ</string>
-  <string name="mtrl_picker_toggle_to_day_selection">ចុច ដើម្បីប្ដូរទៅទិដ្ឋភាពប្រតិទិន</string>
+  <string name="mtrl_picker_toggle_to_year_selection">ចុច​ដើម្បីប្ដូរទៅ​ការជ្រើសរើសឆ្នាំ</string>
+  <string name="mtrl_picker_toggle_to_day_selection">ចុច​ដើម្បីប្ដូរទៅ​ការជ្រើសរើសថ្ងៃ</string>
   <string name="mtrl_picker_day_of_week_column_header">ជួរឈរ​នៃ​ថ្ងៃ៖ %1$s</string>
   <string name="mtrl_picker_announce_current_selection">ការជ្រើសរើស​បច្ចុប្បន្ន៖ %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">ការជ្រើសរើស​កាលបរិច្ឆេទចាប់ផ្ដើម៖ %1$s – ការជ្រើសរើស​កាលបរិច្ឆេទបញ្ចប់៖ %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">គ្មាន</string>
-  <string name="mtrl_picker_navigate_to_year_description">ប្ដូរទៅ​ឆ្នាំ %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">រុករក​ទៅកាន់​ឆ្នាំបច្ចុប្បន្ន %1$d</string>
-  <string name="mtrl_picker_today_description">ថ្ងៃនេះ %1$s</string>
-  <string name="mtrl_picker_start_date_description">កាលបរិច្ឆេទ​ចាប់ផ្ដើម %1$s</string>
-  <string name="mtrl_picker_end_date_description">កាលបរិច្ឆេទ​បញ្ចប់ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">ប្ដូរទៅ​ឆ្នាំ %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-kn/strings.xml b/material/java/com/google/android/material/datepicker/res/values-kn/strings.xml
index c5d4d305f..43461a07f 100644
--- a/material/java/com/google/android/material/datepicker/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ಪಠ್ಯ ಇನ್‌ಪುಟ್ ಮೋಡ್‌ಗೆ ಬದಲಿಸಿ</string>
   <string name="mtrl_picker_a11y_prev_month">ಹಿಂದಿನ ತಿಂಗಳಿಗೆ ಬದಲಿಸಿ</string>
   <string name="mtrl_picker_a11y_next_month">ಮುಂದಿನ ತಿಂಗಳಿಗೆ ಬದಲಿಸಿ</string>
-  <string name="mtrl_picker_toggle_to_year_selection">ವರ್ಷದ ವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Calendar ವೀಕ್ಷಣೆಗೆ ಬದಲಾಯಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
+  <string name="mtrl_picker_toggle_to_year_selection">ವರ್ಷವನ್ನು ಆಯ್ಕೆಗಾಗಿ ಬದಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
+  <string name="mtrl_picker_toggle_to_day_selection">ದಿನವನ್ನು ಆಯ್ಕೆಗಾಗಿ ಬದಲಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
   <string name="mtrl_picker_day_of_week_column_header">ದಿನಗಳ ಕಾಲಮ್: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">ಪ್ರಸ್ತುತ ಆಯ್ಕೆ: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">ಪ್ರಾರಂಭ ದಿನಾಂಕದ ಆಯ್ಕೆ: %1$s – ಅಂತಿಮ ದಿನಾಂಕದ ಆಯ್ಕೆ: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ಯಾವುದೂ ಇಲ್ಲ</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d ವರ್ಷಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ಪ್ರಸ್ತುತ ವರ್ಷ %1$d ಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ</string>
-  <string name="mtrl_picker_today_description">ಇಂದು %1$s</string>
-  <string name="mtrl_picker_start_date_description">ಪ್ರಾರಂಭದ ದಿನಾಂಕ %1$s</string>
-  <string name="mtrl_picker_end_date_description">ಕೊನೆಯ ದಿನಾಂಕ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s ವರ್ಷಕ್ಕೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ko/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ko/strings.xml
index c62b75fd0..4b33ae4fe 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@
   <string name="mtrl_picker_text_input_day_abbr">일</string>
   <string name="mtrl_picker_save">저장</string>
   <string name="mtrl_picker_invalid_range">날짜 범위가 잘못되었습니다.</string>
-  <string name="mtrl_picker_out_of_range">%1$s은 범위를 벗어난 날짜입니다.</string>
+  <string name="mtrl_picker_out_of_range">%1$s은(는) 범위를 벗어난 날짜입니다.</string>
   <string name="mtrl_picker_invalid_format">형식이 잘못되었습니다.</string>
   <string name="mtrl_picker_invalid_format_use">%1$s 사용</string>
   <string name="mtrl_picker_invalid_format_example">예: %1$s</string>
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">텍스트 입력 모드로 전환</string>
   <string name="mtrl_picker_a11y_prev_month">이전 달로 변경</string>
   <string name="mtrl_picker_a11y_next_month">다음 달로 변경</string>
-  <string name="mtrl_picker_toggle_to_year_selection">탭하여 연도 뷰로 전환</string>
-  <string name="mtrl_picker_toggle_to_day_selection">탭하여 캘린더 뷰로 전환</string>
+  <string name="mtrl_picker_toggle_to_year_selection">탭하여 연도 선택으로 전환</string>
+  <string name="mtrl_picker_toggle_to_day_selection">탭하여 요일 선택으로 전환</string>
   <string name="mtrl_picker_day_of_week_column_header">요일 열: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">현재 %1$s 선택됨</string>
-  <string name="mtrl_picker_announce_current_range_selection">시작일 선택: %1$s, 종료일 선택: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">없음</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d년으로 이동</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">현재 연도(%1$d)로 이동</string>
-  <string name="mtrl_picker_today_description">오늘(%1$s)</string>
-  <string name="mtrl_picker_start_date_description">시작일: %1$s</string>
-  <string name="mtrl_picker_end_date_description">종료일: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s년으로 이동</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ky/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ky/strings.xml
index 0ad43da6e..4468ffbef 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -34,22 +34,16 @@
   <string name="mtrl_picker_save">Сактоо</string>
   <string name="mtrl_picker_invalid_range">Жараксыз диапазон.</string>
   <string name="mtrl_picker_out_of_range">Диапазондон тышкары: %1$s</string>
-  <string name="mtrl_picker_invalid_format">Туура эмес формат.</string>
-  <string name="mtrl_picker_invalid_format_use">%1$s деген форматты колдонуңуз</string>
+  <string name="mtrl_picker_invalid_format">Жараксыз формат.</string>
+  <string name="mtrl_picker_invalid_format_use">%1$s формтын колднуңуз</string>
   <string name="mtrl_picker_invalid_format_example">Мисалы: %1$s</string>
   <string name="mtrl_picker_toggle_to_calendar_input_mode">Жылнаамага иш-чара киргизүү режимине которулуу</string>
   <string name="mtrl_picker_toggle_to_text_input_mode">Текст киргизүү режимине которулуу</string>
   <string name="mtrl_picker_a11y_prev_month">Мурунку айга өзгөртүү</string>
   <string name="mtrl_picker_a11y_next_month">Кийинки айга өзгөртүү</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Жыл көрүнүшүнө өтүү үчүн таптап коюңуз</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Жылнаама көрүнүшүнө өтүү үчүн таптап коюңуз</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Жыл тандоо үчүн таптап коюңуз</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Күн тандоо үчүн таптап коюңуз</string>
   <string name="mtrl_picker_day_of_week_column_header">Күндөр тилкеси: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Учурдагы тандоо: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Башталуу күнүн тандоо: %1$s – Аяктоо күнүн тандоо: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">эч бири</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d-жылга өтүү</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Учурдагы жылга өтүү %1$d</string>
-  <string name="mtrl_picker_today_description">Бүгүн %1$s</string>
-  <string name="mtrl_picker_start_date_description">Качан башталат: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Качан аяктайт: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s-жылга өтүү</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-lo/strings.xml b/material/java/com/google/android/material/datepicker/res/values-lo/strings.xml
index 1cecc263a..bf18e393f 100644
--- a/material/java/com/google/android/material/datepicker/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ປ່ຽນເປັນໂໝດປ້ອນຂໍ້ມູນຂໍ້ຄວາມ</string>
   <string name="mtrl_picker_a11y_prev_month">ປ່ຽນເປັນເດືອນຜ່ານມາ</string>
   <string name="mtrl_picker_a11y_next_month">ປ່ຽນເປັນເດືອນຕໍ່ໄປ</string>
-  <string name="mtrl_picker_toggle_to_year_selection">ແຕະເພື່ອສະຫຼັບໄປເປັນມຸມມອງປີ</string>
-  <string name="mtrl_picker_toggle_to_day_selection">ແຕະເພື່ອສະຫຼັບໄປເປັນມຸມມອງປະຕິທິນ</string>
+  <string name="mtrl_picker_toggle_to_year_selection">ແຕະເພື່ອປ່ຽນເປັນການເລືອກປີ</string>
+  <string name="mtrl_picker_toggle_to_day_selection">ແຕະເພື່ອປ່ຽນເປັນການເລືອກມື້</string>
   <string name="mtrl_picker_day_of_week_column_header">ຖັນມື້: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">ການເລືອກປັດຈຸບັນ: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">ການເລືອກວັນທີເລີ່ມຕົ້ນ: %1$s – ການເລືອກວັນທີສິ້ນສຸດ: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ບໍ່ມີ</string>
-  <string name="mtrl_picker_navigate_to_year_description">ເລື່ອນໄປປີ %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ໄປຫາປີປັດຈຸບັນ %1$d</string>
-  <string name="mtrl_picker_today_description">ມື້ນີ້ %1$s</string>
-  <string name="mtrl_picker_start_date_description">ວັນທີເລີ່ມຕົ້ນ %1$s</string>
-  <string name="mtrl_picker_end_date_description">ວັນທີສິ້ນສຸດ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">ເລື່ອນໄປປີ %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-lt/strings.xml b/material/java/com/google/android/material/datepicker/res/values-lt/strings.xml
index 20f0f0653..5b7a5fa9d 100644
--- a/material/java/com/google/android/material/datepicker/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Perjungti į teksto įvesties režimą</string>
   <string name="mtrl_picker_a11y_prev_month">Pakeisti į ankstesnį mėnesį</string>
   <string name="mtrl_picker_a11y_next_month">Pakeisti į kitą mėnesį</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Palieskite, kad perjungtumėte į metų rodinį</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Palieskite, kad perjungtumėte į Kalendoriaus rodinį</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Palieskite, kad perjungtumėte į metų pasirinkimą</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Palieskite, kad perjungtumėte į dienos pasirinkimą</string>
   <string name="mtrl_picker_day_of_week_column_header">Dienų stulpelis: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Dabartinis pasirinkimas: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Pradžios datos pasirinkimas: %1$s – Pabaigos datos pasirinkimas: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">nėra</string>
-  <string name="mtrl_picker_navigate_to_year_description">Eiti į %1$d metus</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Eiti į dabartinius metus %1$d</string>
-  <string name="mtrl_picker_today_description">Šiandien %1$s</string>
-  <string name="mtrl_picker_start_date_description">Pradžios data %1$s</string>
-  <string name="mtrl_picker_end_date_description">Pabaigos data %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Eiti į %1$s metus</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-lv/strings.xml b/material/java/com/google/android/material/datepicker/res/values-lv/strings.xml
index 76dd69b90..f2e13f855 100644
--- a/material/java/com/google/android/material/datepicker/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Pārslēgties uz teksta ievades režīmu</string>
   <string name="mtrl_picker_a11y_prev_month">Pāriet uz iepriekšējo mēnesi</string>
   <string name="mtrl_picker_a11y_next_month">Pāriet uz nākamo mēnesi</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Pieskarieties, lai pārslēgtos uz gada skatu</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Pieskarieties, lai pārslēgtos uz Kalendāra skatu</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Pieskarties, lai pārslēgtos uz gada atlasīšanu</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Pieskarties, lai pārslēgtos uz dienas atlasīšanu</string>
   <string name="mtrl_picker_day_of_week_column_header">Dienu sleja: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Pašreizējā atlase: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Sākuma datuma atlase: %1$s; beigu datuma atlase: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">nav</string>
-  <string name="mtrl_picker_navigate_to_year_description">Pāriet uz šo gadu: %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Pāriet uz pašreizējo gadu (%1$d)</string>
-  <string name="mtrl_picker_today_description">Šodien (%1$s)</string>
-  <string name="mtrl_picker_start_date_description">Sākuma datums: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Beigu datums: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Pāriet uz šo gadu: %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-mk/strings.xml b/material/java/com/google/android/material/datepicker/res/values-mk/strings.xml
index bf7cb394e..a9325f19b 100644
--- a/material/java/com/google/android/material/datepicker/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Префрли на режим за внесување текст</string>
   <string name="mtrl_picker_a11y_prev_month">Промени на претходниот месец</string>
   <string name="mtrl_picker_a11y_next_month">Промени на следниот месец</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Допрете за да се префрлите на приказ на година</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Допрете за да се префрлите на приказ на „Календар“</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Допрете за да се префрлите на избирање година</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Допрете за да се префрлите на избирање ден</string>
   <string name="mtrl_picker_day_of_week_column_header">Колона со денови: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Тековен избор: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Избор на датум на започнување: %1$s – Избор на датум на завршување: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">нема</string>
-  <string name="mtrl_picker_navigate_to_year_description">Оди на %1$d година</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Одете на тековната година: %1$d</string>
-  <string name="mtrl_picker_today_description">Денес: %1$s</string>
-  <string name="mtrl_picker_start_date_description">Почетен датум %1$s</string>
-  <string name="mtrl_picker_end_date_description">Краен датум %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Оди на %1$s година</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ml/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ml/strings.xml
index dfd1a7b4b..f3c86f51e 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ടെക്‌സ്‌റ്റ് ഇൻപുട്ട് മോഡിലേക്ക് മാറുക</string>
   <string name="mtrl_picker_a11y_prev_month">മുമ്പത്തെ മാസത്തിലേക്ക് മാറ്റുക</string>
   <string name="mtrl_picker_a11y_next_month">അടുത്ത മാസത്തിലേക്ക് മാറ്റുക</string>
-  <string name="mtrl_picker_toggle_to_year_selection">വർഷ കാഴ്‌ചയിലേക്ക് മാറാൻ ടാപ്പ് ചെയ്യുക</string>
-  <string name="mtrl_picker_toggle_to_day_selection">കലണ്ടർ കാഴ്‌ചയിലേക്ക് മാറാൻ ടാപ്പ് ചെയ്യുക</string>
+  <string name="mtrl_picker_toggle_to_year_selection">വർഷം തിരഞ്ഞെടുക്കുന്നതിലേക്ക് മാറാൻ ടാപ്പ് ചെയ്യുക</string>
+  <string name="mtrl_picker_toggle_to_day_selection">ദിവസം തിരഞ്ഞെടുക്കുന്നതിലേക്ക് മാറാൻ ടാപ്പ് ചെയ്യുക</string>
   <string name="mtrl_picker_day_of_week_column_header">ദിവസത്തിന്റെ കോളം: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">നിലവിൽ തിരഞ്ഞെടുത്തത്: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">തിരഞ്ഞെടുത്ത ആരംഭിക്കുന്ന തീയതി: %1$s – തിരഞ്ഞെടുത്ത അവസാനിക്കുന്ന തീയതി: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ഒന്നുമില്ല</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d വർഷത്തിലേക്ക് നാവിഗേറ്റ് ചെയ്യുക</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">നിലവിലെ വർഷം %1$d-ലേക്ക് മാറ്റുക</string>
-  <string name="mtrl_picker_today_description">ഇന്ന് %1$s</string>
-  <string name="mtrl_picker_start_date_description">ആരംഭിക്കുന്ന തീയതി: %1$s</string>
-  <string name="mtrl_picker_end_date_description">അവസാനിക്കുന്ന തീയതി: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s വർഷത്തിലേക്ക് നാവിഗേറ്റ് ചെയ്യുക</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-mn/strings.xml b/material/java/com/google/android/material/datepicker/res/values-mn/strings.xml
index 5fa29bbf2..8129581ee 100644
--- a/material/java/com/google/android/material/datepicker/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Текстийн орох горим руу сэлгэх</string>
   <string name="mtrl_picker_a11y_prev_month">Өмнөх сар луу өөрчлөх</string>
   <string name="mtrl_picker_a11y_next_month">Дараагийн сар луу өөрчлөх</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Жилээр нь харуулах руу сэлгэхийн тулд товшино уу</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Календариар харуулах руу сэлгэхийн тулд товшино уу</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Он сонгох руу сэлгэхийн тулд товшино уу</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Өдөр сонгох руу сэлгэхийн тулд товшино уу</string>
   <string name="mtrl_picker_day_of_week_column_header">Өдрийн багана: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Одоогийн сонголт: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Эхлэх огнооны сонголт: %1$s – Дуусах огнооны сонголт: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">байхгүй</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d он руу шилжих</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Одоогийн %1$d он руу шилжих</string>
-  <string name="mtrl_picker_today_description">Өнөөдөр %1$s</string>
-  <string name="mtrl_picker_start_date_description">Эхлэх огноо %1$s</string>
-  <string name="mtrl_picker_end_date_description">Дуусах огноо %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s он руу шилжих</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-mr/strings.xml b/material/java/com/google/android/material/datepicker/res/values-mr/strings.xml
index 96ddd3481..ff694d294 100644
--- a/material/java/com/google/android/material/datepicker/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">मजकूर इनपुट मोडवर स्विच करा</string>
   <string name="mtrl_picker_a11y_prev_month">मागील महिन्यावर बदला</string>
   <string name="mtrl_picker_a11y_next_month">पुढील महिन्यावर बदला</string>
-  <string name="mtrl_picker_toggle_to_year_selection">वर्ष या दृश्यावर स्विच करण्यासाठी टॅप करा</string>
-  <string name="mtrl_picker_toggle_to_day_selection">कॅलेंडर या दृश्यावर स्विच करण्यासाठी टॅप करा</string>
+  <string name="mtrl_picker_toggle_to_year_selection">वर्ष निवडण्यासाठी स्विच करा वर टॅप करा</string>
+  <string name="mtrl_picker_toggle_to_day_selection">दिवस निवडण्यासाठी स्विच करा वर टॅप करा</string>
   <string name="mtrl_picker_day_of_week_column_header">दिवसांचा स्तंभ: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">सध्याची निवड: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">सुरू होण्याच्या तारखेची निवड: %1$s – संपण्याच्या तारखेची निवड: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">काहीही नाही</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d वर्षावर नेव्हिगेट करा</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">सध्याचे वर्ष %1$d यावर नेव्हिगेट करा</string>
-  <string name="mtrl_picker_today_description">आज %1$s</string>
-  <string name="mtrl_picker_start_date_description">सुरू होण्याची तारीख %1$s</string>
-  <string name="mtrl_picker_end_date_description">संपण्याची तारीख %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s वर्षावर नेव्हिगेट करा</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ms/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ms/strings.xml
index e3def1666..a104a76d1 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Beralih kepada mod input teks</string>
   <string name="mtrl_picker_a11y_prev_month">Tukar kepada bulan sebelumnya</string>
   <string name="mtrl_picker_a11y_next_month">Tukar kepada bulan seterusnya</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Ketik untuk menukar kepada paparan tahun</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Ketik untuk menukar kepada paparan Kalendar</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Ketik untuk beralih kepada pemilihan tahun</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Ketik untuk beralih kepada pemilihan hari</string>
   <string name="mtrl_picker_day_of_week_column_header">Lajur hari: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Pilihan semasa: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Pilihan tarikh mula: %1$s – Pilihan tarikh tamat: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">tiada</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navigasi ke tahun %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigasi ke tahun semasa %1$d</string>
-  <string name="mtrl_picker_today_description">Hari ini %1$s</string>
-  <string name="mtrl_picker_start_date_description">Tarikh mula %1$s</string>
-  <string name="mtrl_picker_end_date_description">Tarikh tamat %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navigasi ke tahun %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-my/strings.xml b/material/java/com/google/android/material/datepicker/res/values-my/strings.xml
index 19ad639ff..5ccde86fa 100644
--- a/material/java/com/google/android/material/datepicker/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">စာသား ထည့်သွင်းမှုမုဒ်သို့ ပြောင်းရန်</string>
   <string name="mtrl_picker_a11y_prev_month">ယခင်လသို့ ပြောင်းရန်</string>
   <string name="mtrl_picker_a11y_next_month">နောက်လသို့ ပြောင်းရန်</string>
-  <string name="mtrl_picker_toggle_to_year_selection">နှစ်အလိုက်မြင်ကွင်းသို့ ပြောင်းရန် တို့နိုင်သည်</string>
-  <string name="mtrl_picker_toggle_to_day_selection">ပြက္ခဒိန်မြင်ကွင်းသို့ ပြောင်းရန် တို့နိုင်သည်</string>
+  <string name="mtrl_picker_toggle_to_year_selection">နှစ်ရွေးချယ်ခြင်းသို့ ပြောင်းရန် တို့ပါ</string>
+  <string name="mtrl_picker_toggle_to_day_selection">ရက်ရွေးချယ်ခြင်းသို့ ပြောင်းရန် တို့ပါ</string>
   <string name="mtrl_picker_day_of_week_column_header">ရက်ကော်လံ- %1$s</string>
   <string name="mtrl_picker_announce_current_selection">လက်ရှိ ရွေးချယ်မှု- %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">စတင်ရက် ရွေးရန်- %1$s – ပြီးဆုံးရက် ရွေးရန်- %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">မရှိ</string>
-  <string name="mtrl_picker_navigate_to_year_description">နှစ် %1$d သို့ လမ်းညွှန်ရန်</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">လက်ရှိခုနှစ် %1$d သို့ သွားရန်</string>
-  <string name="mtrl_picker_today_description">ယနေ့ %1$s</string>
-  <string name="mtrl_picker_start_date_description">စတင်ရက် %1$s</string>
-  <string name="mtrl_picker_end_date_description">ပြီးဆုံးရက် %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">နှစ် %1$s သို့ လမ်းညွှန်ရန်</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-nb/strings.xml b/material/java/com/google/android/material/datepicker/res/values-nb/strings.xml
index 1e497caaa..5fb54de38 100644
--- a/material/java/com/google/android/material/datepicker/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Bytt til tekstinndatamodus</string>
   <string name="mtrl_picker_a11y_prev_month">Endre til forrige måned</string>
   <string name="mtrl_picker_a11y_next_month">Endre til neste måned</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Trykk for å bytte til årsvisningen</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Trykk for å bytte til kalendervisningen</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Trykk for å bytte til å velge år</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Trykk for å bytte til å velge dag</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolonne for dager: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Gjeldende valg: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Valg av startdato: %1$s – valg av sluttdato: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ingen</string>
-  <string name="mtrl_picker_navigate_to_year_description">Naviger til år %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Gå til dette året %1$d</string>
-  <string name="mtrl_picker_today_description">I dag %1$s</string>
-  <string name="mtrl_picker_start_date_description">Startdato %1$s</string>
-  <string name="mtrl_picker_end_date_description">Sluttdato %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Naviger til år %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ne/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ne/strings.xml
index 0eb88ba52..a0dee824f 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">पाठको इनपुट मोडमा बदल्नुहोस्</string>
   <string name="mtrl_picker_a11y_prev_month">अघिल्लो महिनामा सार्नुहोस्</string>
   <string name="mtrl_picker_a11y_next_month">अर्को महिनामा सार्नुहोस्</string>
-  <string name="mtrl_picker_toggle_to_year_selection">वर्षको भ्यू प्रयोग गर्न ट्याप गर्नुहोस्</string>
-  <string name="mtrl_picker_toggle_to_day_selection">पात्रोको भ्यू प्रयोग गर्न ट्याप गर्नुहोस्</string>
+  <string name="mtrl_picker_toggle_to_year_selection">कुनै वर्ष चयन गर्ने विकल्प प्रयोग गर्न ट्याप गर्नुहोस्</string>
+  <string name="mtrl_picker_toggle_to_day_selection">कुनै दिन चयन गर्ने विकल्प प्रयोग गर्न ट्याप गर्नुहोस्</string>
   <string name="mtrl_picker_day_of_week_column_header">दिनहरूको स्तम्भ: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">हालको चयन: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">सुरु हुने मितिको चयन: %1$s – अन्त्य हुने मितिको चयन: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">कुनै पनि होइन</string>
-  <string name="mtrl_picker_navigate_to_year_description">वर्ष %1$d मा जानुहोस्</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">चालु वर्ष %1$d मा जानुहोस्</string>
-  <string name="mtrl_picker_today_description">आज %1$s</string>
-  <string name="mtrl_picker_start_date_description">प्रारम्भ हुने मिति: %1$s</string>
-  <string name="mtrl_picker_end_date_description">समापन हुने मिति: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">वर्ष %1$s मा जानुहोस्</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-nl/strings.xml b/material/java/com/google/android/material/datepicker/res/values-nl/strings.xml
index 51b563a72..dd70ce550 100644
--- a/material/java/com/google/android/material/datepicker/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Overschakelen naar tekstinvoermodus</string>
   <string name="mtrl_picker_a11y_prev_month">Naar vorige maand gaan</string>
   <string name="mtrl_picker_a11y_next_month">Naar volgende maand gaan</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tik om over te schakelen naar de jaarweergave</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tik om over te schakelen naar de agendaweergave</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tik om naar jaarselectie te schakelen</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tik om naar dagselectie te schakelen</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolom met dagen: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Huidige selectie: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Startdatumselectie: %1$s – Einddatumselectie: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">geen</string>
-  <string name="mtrl_picker_navigate_to_year_description">Naar jaar %1$d navigeren</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Naar het huidige jaar %1$d gaan</string>
-  <string name="mtrl_picker_today_description">Vandaag %1$s</string>
-  <string name="mtrl_picker_start_date_description">Startdatum %1$s</string>
-  <string name="mtrl_picker_end_date_description">Einddatum %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Naar jaar %1$s navigeren</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-or/strings.xml b/material/java/com/google/android/material/datepicker/res/values-or/strings.xml
index faae50d35..c951f8980 100644
--- a/material/java/com/google/android/material/datepicker/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Switch to text input mode</string>
   <string name="mtrl_picker_a11y_prev_month">Change to previous month</string>
   <string name="mtrl_picker_a11y_next_month">Change to next month</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tap to switch to year view</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tap to switch to Calendar view</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Tap to switch to selecting a year</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Tap to switch to selecting a day</string>
   <string name="mtrl_picker_day_of_week_column_header">Column of days: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Current selection: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Start date selection: %1$s – End date selection: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">none</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navigate to year %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigate to current year %1$d</string>
-  <string name="mtrl_picker_today_description">Today %1$s</string>
-  <string name="mtrl_picker_start_date_description">Start date %1$s</string>
-  <string name="mtrl_picker_end_date_description">End date %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navigate to year %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-pa/strings.xml b/material/java/com/google/android/material/datepicker/res/values-pa/strings.xml
index 8dc0a0984..b5125ae73 100644
--- a/material/java/com/google/android/material/datepicker/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">ਲਿਖਤ ਇਨਪੁੱਟ ਮੋਡ \'ਤੇ ਜਾਓ</string>
   <string name="mtrl_picker_a11y_prev_month">ਪਿਛਲੇ ਮਹੀਨੇ \'ਤੇ ਜਾਓ</string>
   <string name="mtrl_picker_a11y_next_month">ਅਗਲੇ ਮਹੀਨੇ \'ਤੇ ਜਾਓ</string>
-  <string name="mtrl_picker_toggle_to_year_selection">ਸਾਲ ਦ੍ਰਿਸ਼ \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Calendar ਦ੍ਰਿਸ਼ \'ਤੇ ਸਵਿੱਚ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ</string>
+  <string name="mtrl_picker_toggle_to_year_selection">ਸਾਲ ਦੀ ਚੋਣ \'ਤੇ ਜਾਣ ਲਈ ਟੈਪ ਕਰੋ</string>
+  <string name="mtrl_picker_toggle_to_day_selection">ਦਿਨ ਦੀ ਚੋਣ \'ਤੇ ਜਾਣ ਲਈ ਟੈਪ ਕਰੋ</string>
   <string name="mtrl_picker_day_of_week_column_header">ਦਿਨਾਂ ਦਾ ਕਾਲਮ: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">ਮੌਜੂਦਾ ਚੋਣ: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">ਸ਼ੁਰੂਆਤੀ ਤਾਰੀਖ ਦੀ ਚੋਣ: %1$s – ਸਮਾਪਤੀ ਤਾਰੀਖ ਦੀ ਚੋਣ: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ਕੋਈ ਨਹੀਂਂ</string>
-  <string name="mtrl_picker_navigate_to_year_description">ਸਾਲ %1$d \'ਤੇ ਨੈਵੀਗੇਟ ਕਰੋ</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ਮੌਜੂਦਾ ਸਾਲ \'ਤੇ ਜਾਓ %1$d</string>
-  <string name="mtrl_picker_today_description">ਅੱਜ %1$s</string>
-  <string name="mtrl_picker_start_date_description">ਸ਼ੁਰੂਆਤੀ ਤਾਰੀਖ %1$s</string>
-  <string name="mtrl_picker_end_date_description">ਸਮਾਪਤੀ ਤਾਰੀਖ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">ਸਾਲ %1$s \'ਤੇ ਨੈਵੀਗੇਟ ਕਰੋ</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-pl/strings.xml b/material/java/com/google/android/material/datepicker/res/values-pl/strings.xml
index d62e06745..0609759e5 100644
--- a/material/java/com/google/android/material/datepicker/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Włącz tekstowy tryb wprowadzania</string>
   <string name="mtrl_picker_a11y_prev_month">Zmień na poprzedni miesiąc</string>
   <string name="mtrl_picker_a11y_next_month">Zmień na następny miesiąc</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Kliknij, aby przełączyć się na widok roku</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Kliknij, aby przełączyć się na widok kalendarza</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Kliknij, by wybrać rok</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Kliknij, by wybrać dzień</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolumna z dniami: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Bieżący wybór: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Wybrana data rozpoczęcia: %1$s – wybrana data zakończenia: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">brak</string>
-  <string name="mtrl_picker_navigate_to_year_description">Przejdź do roku %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Przejdź do bieżącego roku %1$d</string>
-  <string name="mtrl_picker_today_description">Dzisiaj %1$s</string>
-  <string name="mtrl_picker_start_date_description">Data rozpoczęcia %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data zakończenia %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Przejdź do roku %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/datepicker/res/values-pt-rBR/strings.xml
index fc61ff355..fadd8eca2 100644
--- a/material/java/com/google/android/material/datepicker/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Alternar para o modo de entrada de texto</string>
   <string name="mtrl_picker_a11y_prev_month">Alterar para o mês anterior</string>
   <string name="mtrl_picker_a11y_next_month">Alterar para o próximo mês</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Toque para mudar para a visualização \"Ano\"</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Toque para mudar para a visualização de agenda</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Toque para alternar para a seleção de um ano</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Toque para alternar para a seleção de um dia</string>
   <string name="mtrl_picker_day_of_week_column_header">Coluna de dias: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Seleção atual: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Seleção da data de início: %1$s. Seleção da data de término: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">nenhuma</string>
-  <string name="mtrl_picker_navigate_to_year_description">Ir para o ano %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Ir para o ano atual %1$d</string>
-  <string name="mtrl_picker_today_description">Hoje %1$s</string>
-  <string name="mtrl_picker_start_date_description">Data de início: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data de término: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Ir para o ano %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/datepicker/res/values-pt-rPT/strings.xml
index f82d076b2..2d53ca9ab 100644
--- a/material/java/com/google/android/material/datepicker/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Mudar para o modo de introdução de texto</string>
   <string name="mtrl_picker_a11y_prev_month">Mudar para o mês anterior</string>
   <string name="mtrl_picker_a11y_next_month">Mudar para o mês seguinte</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Toque para mudar para a vista de ano</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Toque para mudar para a vista do Calendário</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Toque para mudar para a seleção do ano</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Toque para mudar para a seleção do dia</string>
   <string name="mtrl_picker_day_of_week_column_header">Coluna de dias: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Seleção atual: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Seleção da data de início: %1$s – Seleção da data de fim: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">nenhuma</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navegue para o ano %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navegar para o ano atual %1$d</string>
-  <string name="mtrl_picker_today_description">Hoje %1$s</string>
-  <string name="mtrl_picker_start_date_description">Data de início: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data de fim: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navegue para o ano %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ro/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ro/strings.xml
index b7416c5e7..73e4fa18e 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Comutați la modul de introducere a textului</string>
   <string name="mtrl_picker_a11y_prev_month">Treceți la luna anterioară</string>
   <string name="mtrl_picker_a11y_next_month">Treceți la luna următoare</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Atingeți pentru a comuta la afișarea An</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Atingeți pentru a comuta la afișarea Calendar</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Atingeți pentru a comuta la selectarea unui an</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Atingeți pentru a comuta la selectarea unei zile</string>
   <string name="mtrl_picker_day_of_week_column_header">Coloana cu zile: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Selecția actuală: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Selectarea datei de începere: %1$s – selectarea datei de încheiere: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">niciuna</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navigați la anul %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigați la anul actual %1$d</string>
-  <string name="mtrl_picker_today_description">Astăzi, la %1$s</string>
-  <string name="mtrl_picker_start_date_description">Data de începere: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data de încheiere: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navigați la anul %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ru/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ru/strings.xml
index 2aade0793..52e3e1234 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Перейти в режим ввода текста</string>
   <string name="mtrl_picker_a11y_prev_month">Перейти к предыдущему месяцу</string>
   <string name="mtrl_picker_a11y_next_month">Перейти к следующему месяцу</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Нажмите, чтобы выбрать год</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Нажмите, чтобы перейти к Календарю</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Нажмите, чтобы перейти к выбору года</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Нажмите, чтобы перейти к выбору дня</string>
   <string name="mtrl_picker_day_of_week_column_header">Столбец со днями недели: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Выбранный элемент: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Выбранная дата начала: %1$s. Выбранная дата окончания: %2$s.</string>
-  <string name="mtrl_picker_announce_current_selection_none">нет</string>
-  <string name="mtrl_picker_navigate_to_year_description">Перейти к %1$d году</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Перейти к текущему году: %1$d</string>
-  <string name="mtrl_picker_today_description">Сегодня: %1$s</string>
-  <string name="mtrl_picker_start_date_description">Дата начала: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Дата окончания: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Перейти к %1$s году</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-si/strings.xml b/material/java/com/google/android/material/datepicker/res/values-si/strings.xml
index 5a04ff32c..b267d75b6 100644
--- a/material/java/com/google/android/material/datepicker/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">පෙළ ආදාන ප්‍රකාරයට මාරු වන්න</string>
   <string name="mtrl_picker_a11y_prev_month">කලින් මාසයට වෙනස් කරන්න</string>
   <string name="mtrl_picker_a11y_next_month">ලබන මාසයට වෙනස් කරන්න</string>
-  <string name="mtrl_picker_toggle_to_year_selection">වසරේ දසුන වෙත මාරු වීමට තට්ටු කරන්න</string>
-  <string name="mtrl_picker_toggle_to_day_selection">දින දර්ශන දසුන වෙත මාරු වීමට තට්ටු කරන්න</string>
+  <string name="mtrl_picker_toggle_to_year_selection">වසරක් තේරීමට මාරු වීමට තට්ටු කරන්න</string>
+  <string name="mtrl_picker_toggle_to_day_selection">දිනයක් තේරීමට මාරු වීමට තට්ටු කරන්න</string>
   <string name="mtrl_picker_day_of_week_column_header">දින තීරුව: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">වත්මන් තේරීම: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">ආරම්භක දිනය තේරීම: %1$s – අවසාන දිනය තේරීම: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">කිසිවක් නැත</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d වසරට සංචාලනය කරන්න</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">වත්මන් වර්ෂය %1$d වෙත සංචාලනය කරන්න</string>
-  <string name="mtrl_picker_today_description">අද %1$s</string>
-  <string name="mtrl_picker_start_date_description">ආරම්භක දිනය %1$s</string>
-  <string name="mtrl_picker_end_date_description">අවසාන දිනය %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s වසරට සංචාලනය කරන්න</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-sk/strings.xml b/material/java/com/google/android/material/datepicker/res/values-sk/strings.xml
index 8f082e546..152da89dd 100644
--- a/material/java/com/google/android/material/datepicker/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Prepnúť na textový režim vstupu</string>
   <string name="mtrl_picker_a11y_prev_month">Predchádzajúci mesiac</string>
   <string name="mtrl_picker_a11y_next_month">Ďalší mesiac</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Klepnutím prepnete na zobrazenie jednotlivých rokov</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Klepnutím prepnete na zobrazenie kalendára</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Klepnutím prepnete na výber roka</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Klepnutím prepnete na výber dňa</string>
   <string name="mtrl_picker_day_of_week_column_header">Stĺpec dní: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Aktuálny výber: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Výber dátumu začatia: %1$s – Výber dátumu ukončenia: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">prázdne</string>
-  <string name="mtrl_picker_navigate_to_year_description">Prejsť na rok %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Prejsť na aktuálny rok %1$d</string>
-  <string name="mtrl_picker_today_description">Dnes %1$s</string>
-  <string name="mtrl_picker_start_date_description">Dátum začatia %1$s</string>
-  <string name="mtrl_picker_end_date_description">Dátum ukončenia %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Prejsť na rok %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-sl/strings.xml b/material/java/com/google/android/material/datepicker/res/values-sl/strings.xml
index 5f3f68cba..c4807d823 100644
--- a/material/java/com/google/android/material/datepicker/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Preklop na način vnosa besedila</string>
   <string name="mtrl_picker_a11y_prev_month">Spremeni na prejšnji mesec</string>
   <string name="mtrl_picker_a11y_next_month">Spremeni na naslednji mesec</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Dotaknite se za preklop na pogled leta</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Dotaknite se za preklop na pogled koledarja</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Dotik za preklop na izbiro leta</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Dotik za preklop na izbiro dneva</string>
   <string name="mtrl_picker_day_of_week_column_header">Stolpec dni: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Trenutna izbira: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Izbira začetnega datuma: %1$s – Izbira končnega datuma: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">brez</string>
-  <string name="mtrl_picker_navigate_to_year_description">Pomik na leto %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Pomik na trenutno leto %1$d</string>
-  <string name="mtrl_picker_today_description">Danes %1$s</string>
-  <string name="mtrl_picker_start_date_description">Začetni datum %1$s</string>
-  <string name="mtrl_picker_end_date_description">Končni datum %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Pomik na leto %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-sq/strings.xml b/material/java/com/google/android/material/datepicker/res/values-sq/strings.xml
index e6e794f63..a660f7433 100644
--- a/material/java/com/google/android/material/datepicker/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Kalo te modaliteti i \"Hyrjes së tekstit\"</string>
   <string name="mtrl_picker_a11y_prev_month">Ndrysho te muaji i kaluar</string>
   <string name="mtrl_picker_a11y_next_month">Ndrysho te muaji i ardhshëm</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Trokit për t\'u kthyer te pamja vjetore</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Trokit për t\'u kthyer te pamja e \"Kalendarit\"</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Trokit për të kaluar te zgjedhja e një viti</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Trokit për të kaluar te zgjedhja e një dite</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolona e ditëve: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Zgjedhja aktuale: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Zgjedhja e datës së fillimit: %1$s - Zgjedhja e datës së përfundimit: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">asnjë</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navigo te viti %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigo te viti aktual %1$d</string>
-  <string name="mtrl_picker_today_description">Sot %1$s</string>
-  <string name="mtrl_picker_start_date_description">Data e fillimit: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Data e mbarimit: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navigo te viti %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-sr/strings.xml b/material/java/com/google/android/material/datepicker/res/values-sr/strings.xml
index a59bbbb66..1a2b47b9b 100644
--- a/material/java/com/google/android/material/datepicker/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Пређите на режим уноса текста</string>
   <string name="mtrl_picker_a11y_prev_month">Пређите на претходни месец</string>
   <string name="mtrl_picker_a11y_next_month">Пређите на следећи месец</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Додирните да бисте прешли на приказ године</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Додирните да бисте прешли на приказ календара</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Додирните да бисте прешли на избор године</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Додирните да бисте прешли на избор дана</string>
   <string name="mtrl_picker_day_of_week_column_header">Колона са данима: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Актуелни избор: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Избор датума почетка: %1$s – Избор датума завршетка: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ништа</string>
-  <string name="mtrl_picker_navigate_to_year_description">Идите на годину %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Идите на актуелну годину %1$d</string>
-  <string name="mtrl_picker_today_description">Данас %1$s</string>
-  <string name="mtrl_picker_start_date_description">Датум почетка %1$s</string>
-  <string name="mtrl_picker_end_date_description">Датум завршетка %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Идите на годину %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-sv/strings.xml b/material/java/com/google/android/material/datepicker/res/values-sv/strings.xml
index 906685a3e..75dfb84f2 100644
--- a/material/java/com/google/android/material/datepicker/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Byt till text som inmatningsläge</string>
   <string name="mtrl_picker_a11y_prev_month">Ändra till föregående månad</string>
   <string name="mtrl_picker_a11y_next_month">Ändra till nästa månad</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Tryck för att byta till årsvy</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Tryck för att byta till kalendervy</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Byt till att välja ett år genom att trycka</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Byt till att välja en dag genom att trycka</string>
   <string name="mtrl_picker_day_of_week_column_header">Kolumn med dagar: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Aktuellt val: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Val av startdatum: %1$s – val av slutdatum: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">inget</string>
-  <string name="mtrl_picker_navigate_to_year_description">Navigera till år %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Navigera till innevarande år %1$d</string>
-  <string name="mtrl_picker_today_description">Idag %1$s</string>
-  <string name="mtrl_picker_start_date_description">Startdatum %1$s</string>
-  <string name="mtrl_picker_end_date_description">Slutdatum %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Navigera till år %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-sw/strings.xml b/material/java/com/google/android/material/datepicker/res/values-sw/strings.xml
index 73995a57e..473e713db 100644
--- a/material/java/com/google/android/material/datepicker/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Tumia programu ya kuingiza data ya maandishi</string>
   <string name="mtrl_picker_a11y_prev_month">Rudi kwenye mwezi uliotangulia</string>
   <string name="mtrl_picker_a11y_next_month">Nenda kwenye mwezi unaofuata</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Gusa ili ubadilishe kwenda mwonekano wa mwaka</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Gusa ili ubadilishe kwenda mwonekano wa Kalenda</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Gusa ili uende kwenye sehemu ya kuchagua mwaka</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Gusa ili uende kwenye sehemu ya kuchagua siku</string>
   <string name="mtrl_picker_day_of_week_column_header">Safu wima ya siku: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Uteuzi wa sasa: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Uteuzi wa tarehe ya kuanza: %1$s - Uteuzi wa tarehe ya mwisho: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">hakuna</string>
-  <string name="mtrl_picker_navigate_to_year_description">Sogeza kwenye mwaka wa %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Sogeza kwenye mwaka huu %1$d</string>
-  <string name="mtrl_picker_today_description">Leo %1$s</string>
-  <string name="mtrl_picker_start_date_description">Tarehe ya kuanza %1$s</string>
-  <string name="mtrl_picker_end_date_description">Tarehe ya kumaliza %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Sogeza kwenye mwaka wa %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ta/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ta/strings.xml
index 9d97e6998..7b64f30a3 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">உரை உள்ளீட்டு முறைக்கு மாற்றும்</string>
   <string name="mtrl_picker_a11y_prev_month">முந்தைய மாதத்தைக் காட்டு</string>
   <string name="mtrl_picker_a11y_next_month">அடுத்த மாதத்தைக் காட்டு</string>
-  <string name="mtrl_picker_toggle_to_year_selection">ஆண்டுக் காட்சிக்கு மாற தட்டவும்</string>
-  <string name="mtrl_picker_toggle_to_day_selection">கேலெண்டர் காட்சிக்கு மாற தட்டவும்</string>
+  <string name="mtrl_picker_toggle_to_year_selection">ஆண்டைத் தேர்வுசெய்வதற்கு மாற்ற தட்டவும்</string>
+  <string name="mtrl_picker_toggle_to_day_selection">நாளைத் தேர்வுசெய்வதற்கு மாற்ற தட்டவும்</string>
   <string name="mtrl_picker_day_of_week_column_header">நாட்களின் நெடுவரிசை: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">தற்போதைய தேர்வு: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">தொடங்கும் தேதியைத் தேர்ந்தெடுங்கள்: %1$s – முடியும் தேதியைத் தேர்ந்தெடுங்கள்: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">எதுவுமில்லை</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d ஆம் ஆண்டிற்குச் செல்லும்</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">தற்போதைய வருடத்திற்கு (%1$d) செல்லும்</string>
-  <string name="mtrl_picker_today_description">இன்று %1$s</string>
-  <string name="mtrl_picker_start_date_description">தொடங்கும் தேதி %1$s</string>
-  <string name="mtrl_picker_end_date_description">முடியும் தேதி %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s ஆம் ஆண்டிற்குச் செல்லும்</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-te/strings.xml b/material/java/com/google/android/material/datepicker/res/values-te/strings.xml
index 95758cfa9..7bb4f13ea 100644
--- a/material/java/com/google/android/material/datepicker/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -24,14 +24,14 @@
   <string name="mtrl_picker_date_header_unselected">ఎంచుకున్న తేది</string>
   <string name="mtrl_picker_date_header_selected">%1$s</string>
   <string name="mtrl_picker_confirm">సరే</string>
-  <string name="mtrl_picker_cancel">రద్దు చేయండి</string>
+  <string name="mtrl_picker_cancel">రద్దు చేయి</string>
   <string name="mtrl_picker_text_input_date_hint">తేదీ</string>
   <string name="mtrl_picker_text_input_date_range_start_hint">ప్రారంభ తేదీ</string>
   <string name="mtrl_picker_text_input_date_range_end_hint">ముగింపు తేదీ</string>
   <string name="mtrl_picker_text_input_year_abbr">సం</string>
   <string name="mtrl_picker_text_input_month_abbr">నె</string>
   <string name="mtrl_picker_text_input_day_abbr">రో</string>
-  <string name="mtrl_picker_save">సేవ్ చేయండి</string>
+  <string name="mtrl_picker_save">సేవ్ చేయి</string>
   <string name="mtrl_picker_invalid_range">చెల్లని పరిధి.</string>
   <string name="mtrl_picker_out_of_range">పరిధి వెలుపల ఉంది: %1$s</string>
   <string name="mtrl_picker_invalid_format">ఫార్మాట్ చెల్లదు.</string>
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">వచన ఇన్‌పుట్ మోడ్‌కు మారుస్తుంది</string>
   <string name="mtrl_picker_a11y_prev_month">మునుపటి నెలకు మార్చుతుంది</string>
   <string name="mtrl_picker_a11y_next_month">వచ్చే నెలకు మార్చుతుంది</string>
-  <string name="mtrl_picker_toggle_to_year_selection">సంవత్సర వీక్షణకు మారడానికి ట్యాప్ చేయండి</string>
-  <string name="mtrl_picker_toggle_to_day_selection">క్యాలెండర్ వీక్షణకు మారడానికి ట్యాప్ చేయండి</string>
+  <string name="mtrl_picker_toggle_to_year_selection">\'సంవత్సరాన్ని ఎంపిక చేసుకోవడం\'కు మారడానికి నొక్కండి</string>
+  <string name="mtrl_picker_toggle_to_day_selection">\'రోజును ఎంపిక చేసుకోవడం\'కు మారడానికి నొక్కండి</string>
   <string name="mtrl_picker_day_of_week_column_header">రోజుల నిలువు వరుస: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">ప్రస్తుత ఎంపిక: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">ప్రారంభ తేదీ ఎంపిక: %1$s – ముగింపు తేదీ ఎంపిక: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ఏదీ వద్దు</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$dసంవత్సరానికి నావిగేట్ చేస్తుంది</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ప్రస్తుత సంవత్సరానికి %1$d నావిగేట్ చేయండి</string>
-  <string name="mtrl_picker_today_description">ఈరోజు %1$s</string>
-  <string name="mtrl_picker_start_date_description">ప్రారంభ తేదీ %1$s</string>
-  <string name="mtrl_picker_end_date_description">ముగింపు తేదీ %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$sసంవత్సరానికి నావిగేట్ చేస్తుంది</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-th/strings.xml b/material/java/com/google/android/material/datepicker/res/values-th/strings.xml
index 377e38879..209a8c3a3 100644
--- a/material/java/com/google/android/material/datepicker/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">สลับไปใช้โหมดป้อนข้อมูลข้อความ</string>
   <string name="mtrl_picker_a11y_prev_month">เปลี่ยนไปที่เดือนก่อนหน้า</string>
   <string name="mtrl_picker_a11y_next_month">เปลี่ยนไปที่เดือนถัดไป</string>
-  <string name="mtrl_picker_toggle_to_year_selection">แตะเพื่อเปลี่ยนเป็นมุมมองปี</string>
-  <string name="mtrl_picker_toggle_to_day_selection">แตะเพื่อเปลี่ยนเป็นมุมมองปฏิทิน</string>
+  <string name="mtrl_picker_toggle_to_year_selection">แตะเพื่อสลับไปใช้การเลือกปี</string>
+  <string name="mtrl_picker_toggle_to_day_selection">แตะเพื่อสลับไปใช้การเลือกวัน</string>
   <string name="mtrl_picker_day_of_week_column_header">คอลัมน์ของวัน: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">การเลือกในปัจจุบัน: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">การเลือกวันที่เริ่มต้น: %1$s – การเลือกวันที่สิ้นสุด: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">ไม่มี</string>
-  <string name="mtrl_picker_navigate_to_year_description">ไปที่ปี %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">ไปยังปีปัจจุบัน %1$d</string>
-  <string name="mtrl_picker_today_description">วันนี้ %1$s</string>
-  <string name="mtrl_picker_start_date_description">วันที่เริ่มต้น %1$s</string>
-  <string name="mtrl_picker_end_date_description">วันที่สิ้นสุด %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">ไปที่ปี %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-tl/strings.xml b/material/java/com/google/android/material/datepicker/res/values-tl/strings.xml
index ef73ef60c..e380b2f45 100644
--- a/material/java/com/google/android/material/datepicker/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Lumipat sa pamamaraan ng pag-input ng text</string>
   <string name="mtrl_picker_a11y_prev_month">Lumipat sa nakaraang buwan</string>
   <string name="mtrl_picker_a11y_next_month">Lumipat sa susunod na buwan</string>
-  <string name="mtrl_picker_toggle_to_year_selection">I-tap para lumipat sa view ng taon</string>
-  <string name="mtrl_picker_toggle_to_day_selection">I-tap para lumipat sa view ng Kalendaryo</string>
+  <string name="mtrl_picker_toggle_to_year_selection">I-tap para lumipat sa pagpili ng taon</string>
+  <string name="mtrl_picker_toggle_to_day_selection">I-tap para lumipat sa pagpili ng araw</string>
   <string name="mtrl_picker_day_of_week_column_header">Column ng mga araw: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Kasalukuyang seleksyon: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Napiling petsa ng pagsisimula: %1$s – Napiling petsa ng pagtatapos: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">wala</string>
-  <string name="mtrl_picker_navigate_to_year_description">Mag-navigate patungo sa taong %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Mag-navigate sa kasalukuyang taon %1$d</string>
-  <string name="mtrl_picker_today_description">Ngayon %1$s</string>
-  <string name="mtrl_picker_start_date_description">Petsa ng pagsisimula %1$s</string>
-  <string name="mtrl_picker_end_date_description">Petsa ng pagtatapos %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Mag-navigate patungo sa taong %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-tr/strings.xml b/material/java/com/google/android/material/datepicker/res/values-tr/strings.xml
index e2ce10ac0..2ae3efac7 100644
--- a/material/java/com/google/android/material/datepicker/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Metin giriş moduna geç</string>
   <string name="mtrl_picker_a11y_prev_month">Önceki aya değiştir</string>
   <string name="mtrl_picker_a11y_next_month">Sonraki aya değiştir</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Yıl görünümüne geçmek için dokunun</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Takvim görünümüne geçmek için dokunun</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Yıl seçmeye geçmek için dokunun</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Gün seçmeye geçmek için dokunun</string>
   <string name="mtrl_picker_day_of_week_column_header">Gün sütunu: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Geçerli seçim: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Başlangıç tarihi seçimi: %1$s – Bitiş tarihi seçimi: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">yok</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d yılına git</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Geçerli yıla (%1$d) git</string>
-  <string name="mtrl_picker_today_description">Bugün, %1$s</string>
-  <string name="mtrl_picker_start_date_description">Başlangıç tarihi: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Bitiş tarihi: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s yılına git</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-uk/strings.xml b/material/java/com/google/android/material/datepicker/res/values-uk/strings.xml
index a35af823f..09a191aa3 100644
--- a/material/java/com/google/android/material/datepicker/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Перейти в режим введення тексту</string>
   <string name="mtrl_picker_a11y_prev_month">Перейти до попереднього місяця</string>
   <string name="mtrl_picker_a11y_next_month">Перейти до наступного місяця</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Натисніть, щоб перейти до перегляду року</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Натисніть, щоб перейти до перегляду календаря</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Натисніть, щоб вибрати рік</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Натисніть, щоб вибрати день</string>
   <string name="mtrl_picker_day_of_week_column_header">Стовпець із днями: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Поточний вибір: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Вибрана дата початку – %1$s; вибрана дата завершення – %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">немає</string>
-  <string name="mtrl_picker_navigate_to_year_description">Перейти до %1$d року</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Перейти до поточного року: %1$d</string>
-  <string name="mtrl_picker_today_description">Сьогодні: %1$s</string>
-  <string name="mtrl_picker_start_date_description">Дата початку: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Дата завершення: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Перейти до %1$s року</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-ur/strings.xml b/material/java/com/google/android/material/datepicker/res/values-ur/strings.xml
index d7db7e69f..84e1e180b 100644
--- a/material/java/com/google/android/material/datepicker/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">متنی ان پٹ وضع پر سوئچ کریں</string>
   <string name="mtrl_picker_a11y_prev_month">گزشتہ ماہ میں منتقل کریں</string>
   <string name="mtrl_picker_a11y_next_month">اگلے مہینہ میں منتقل کریں</string>
-  <string name="mtrl_picker_toggle_to_year_selection">سال کے منظر پر سوئچ کرنے کے لیے تھپتھپائیں</string>
-  <string name="mtrl_picker_toggle_to_day_selection">کیلنڈر منظر پر سوئچ کرنے کے لیے تھپتھپائیں</string>
+  <string name="mtrl_picker_toggle_to_year_selection">سال کو منتخب کرنے کے ليے سوئچ پر تھپتھپائیں</string>
+  <string name="mtrl_picker_toggle_to_day_selection">دن کو منتخب کرنے کے ليے سوئچ پر تھپتھپائیں</string>
   <string name="mtrl_picker_day_of_week_column_header">دنوں کا کالم: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">موجودہ انتخاب: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">تاریخ آغاز کا انتخاب: %1$s – تاریخ اختتام کا انتخاب: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">کوئی نہیں</string>
-  <string name="mtrl_picker_navigate_to_year_description">%1$d سال پر نیویگیٹ کریں</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">سال رواں %1$d پر نیویگیٹ کریں</string>
-  <string name="mtrl_picker_today_description">آج %1$s</string>
-  <string name="mtrl_picker_start_date_description">تاریخ آغاز %1$s</string>
-  <string name="mtrl_picker_end_date_description">تاریخ اختتام %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">%1$s سال پر نیویگیٹ کریں</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-uz/strings.xml b/material/java/com/google/android/material/datepicker/res/values-uz/strings.xml
index 884bb8f91..ff84889fd 100644
--- a/material/java/com/google/android/material/datepicker/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Matn kiritish rejimiga oʻtish</string>
   <string name="mtrl_picker_a11y_prev_month">Avvalgi oyga oʻzgartirish</string>
   <string name="mtrl_picker_a11y_next_month">Keyingi oyga oʻzgartirish</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Yillik shaklda koʻrish uchun bosing</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Taqvim shaklida koʻrish uchun bosing</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Yilni tanlash uchun bosing</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Kunni tanlash uchun bosing</string>
   <string name="mtrl_picker_day_of_week_column_header">Kunlar ustuni: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Joriy tanlov: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Boshlanish sanasini tanlash: %1$s – Tugash sanasini tanlash: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">hech qanday</string>
-  <string name="mtrl_picker_navigate_to_year_description">Yilga nazar solish: %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Joriy yilga oʻtish %1$d</string>
-  <string name="mtrl_picker_today_description">Bugun %1$s</string>
-  <string name="mtrl_picker_start_date_description">Boshlanish sanasi: %1$s</string>
-  <string name="mtrl_picker_end_date_description">Tugash sanasi: %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Yilga nazar solish: %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-vi/strings.xml b/material/java/com/google/android/material/datepicker/res/values-vi/strings.xml
index a0625ed15..b32a196a4 100644
--- a/material/java/com/google/android/material/datepicker/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Chuyển sang chế độ nhập văn bản</string>
   <string name="mtrl_picker_a11y_prev_month">Chuyển về tháng trước</string>
   <string name="mtrl_picker_a11y_next_month">Chuyển sang tháng tiếp theo</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Nhấn để chuyển sang chế độ xem theo năm</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Nhấn để chuyển sang chế độ xem theo lịch</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Nhấn để chuyển sang chế độ chọn một năm</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Nhấn để chuyển sang chế độ chọn một ngày</string>
   <string name="mtrl_picker_day_of_week_column_header">Cột ngày: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Lựa chọn hiện tại: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Ngày bắt đầu được chọn: %1$s – Ngày kết thúc được chọn: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">không có</string>
-  <string name="mtrl_picker_navigate_to_year_description">Chuyển tới năm %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Chuyển đến năm hiện tại %1$d</string>
-  <string name="mtrl_picker_today_description">Hôm nay %1$s</string>
-  <string name="mtrl_picker_start_date_description">Ngày bắt đầu %1$s</string>
-  <string name="mtrl_picker_end_date_description">Ngày kết thúc %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Chuyển tới năm %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/datepicker/res/values-zh-rCN/strings.xml
index 423f8df92..855c65de9 100644
--- a/material/java/com/google/android/material/datepicker/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">切换到文本字段输入模式</string>
   <string name="mtrl_picker_a11y_prev_month">转到上个月</string>
   <string name="mtrl_picker_a11y_next_month">转到下个月</string>
-  <string name="mtrl_picker_toggle_to_year_selection">点按即可切换到年视图</string>
-  <string name="mtrl_picker_toggle_to_day_selection">点按即可切换到日历视图</string>
+  <string name="mtrl_picker_toggle_to_year_selection">点按即可切换到选择某年</string>
+  <string name="mtrl_picker_toggle_to_day_selection">点按即可切换到选择某天</string>
   <string name="mtrl_picker_day_of_week_column_header">表示周几的列：%1$s</string>
   <string name="mtrl_picker_announce_current_selection">当前的选择是：%1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">开始日期选择：%1$s – 结束日期选择：%2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">无</string>
-  <string name="mtrl_picker_navigate_to_year_description">转到 %1$d 年</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">转到今年%1$d</string>
-  <string name="mtrl_picker_today_description">今天%1$s</string>
-  <string name="mtrl_picker_start_date_description">开始日期 %1$s</string>
-  <string name="mtrl_picker_end_date_description">结束日期 %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">转到 %1$s 年</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/datepicker/res/values-zh-rHK/strings.xml
index 2fa8ac366..a82fc2753 100644
--- a/material/java/com/google/android/material/datepicker/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
   <string name="mtrl_picker_range_header_only_start_selected">%1$s – 結束日期</string>
   <string name="mtrl_picker_range_header_only_end_selected">開始日期 – %1$s</string>
   <string name="mtrl_picker_range_header_selected">%1$s – %2$s</string>
-  <string name="mtrl_picker_date_header_unselected">所選日期</string>
+  <string name="mtrl_picker_date_header_unselected">已選取日期</string>
   <string name="mtrl_picker_date_header_selected">%1$s</string>
   <string name="mtrl_picker_confirm">確定</string>
   <string name="mtrl_picker_cancel">取消</string>
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">切換至文字輸入模式</string>
   <string name="mtrl_picker_a11y_prev_month">變更為上個月</string>
   <string name="mtrl_picker_a11y_next_month">變更為下個月</string>
-  <string name="mtrl_picker_toggle_to_year_selection">㩒一下就可以切換去按年檢視模式</string>
-  <string name="mtrl_picker_toggle_to_day_selection">㩒一下就可以切換去日曆檢視模式</string>
+  <string name="mtrl_picker_toggle_to_year_selection">輕按以切換至選擇年份</string>
+  <string name="mtrl_picker_toggle_to_day_selection">輕按以切換至選擇日期</string>
   <string name="mtrl_picker_day_of_week_column_header">日期欄：%1$s</string>
   <string name="mtrl_picker_announce_current_selection">目前選取：%1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">開始日期選項：%1$s – 結束日期選項：%2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">冇</string>
-  <string name="mtrl_picker_navigate_to_year_description">瀏覽至 %1$d 年</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">去今個年度 %1$d</string>
-  <string name="mtrl_picker_today_description">今日 %1$s</string>
-  <string name="mtrl_picker_start_date_description">開始日期係 %1$s</string>
-  <string name="mtrl_picker_end_date_description">結束日期係 %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">瀏覽至 %1$s 年</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/datepicker/res/values-zh-rTW/strings.xml
index dcc1292d3..479932655 100644
--- a/material/java/com/google/android/material/datepicker/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">切換至文字輸入模式</string>
   <string name="mtrl_picker_a11y_prev_month">變更至上個月</string>
   <string name="mtrl_picker_a11y_next_month">變更至下個月</string>
-  <string name="mtrl_picker_toggle_to_year_selection">輕觸即可切換至年份檢視畫面</string>
-  <string name="mtrl_picker_toggle_to_day_selection">輕觸即可切換至日曆檢視畫面</string>
+  <string name="mtrl_picker_toggle_to_year_selection">輕觸即可切換為選取年份</string>
+  <string name="mtrl_picker_toggle_to_day_selection">輕觸即可切換為選取星期幾</string>
   <string name="mtrl_picker_day_of_week_column_header">星期幾資料欄：%1$s</string>
   <string name="mtrl_picker_announce_current_selection">目前選取：%1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">所選開始日期：%1$s - 所選結束日期：%2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">無</string>
-  <string name="mtrl_picker_navigate_to_year_description">前往 %1$d 年</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">前往今年 %1$d</string>
-  <string name="mtrl_picker_today_description">今天 %1$s</string>
-  <string name="mtrl_picker_start_date_description">開始日期：%1$s</string>
-  <string name="mtrl_picker_end_date_description">結束日期：%1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">前往 %1$s 年</string>
 </resources>
diff --git a/material/java/com/google/android/material/datepicker/res/values-zu/strings.xml b/material/java/com/google/android/material/datepicker/res/values-zu/strings.xml
index 215b73ab0..3f5c3c7e1 100644
--- a/material/java/com/google/android/material/datepicker/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/datepicker/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -41,15 +41,9 @@
   <string name="mtrl_picker_toggle_to_text_input_mode">Shintshela kwimodi yokufaka yombhalo</string>
   <string name="mtrl_picker_a11y_prev_month">Shintshela kunyanga edlule</string>
   <string name="mtrl_picker_a11y_next_month">Shintshela kunyanga elandelayo</string>
-  <string name="mtrl_picker_toggle_to_year_selection">Thepha ukuze ushintshele ekubukeni konyaka</string>
-  <string name="mtrl_picker_toggle_to_day_selection">Thepha ukuze ushintshele ekubukeni Kwekhalenda</string>
+  <string name="mtrl_picker_toggle_to_year_selection">Thepha ukuze ushintshele ekukhetheni unyaka</string>
+  <string name="mtrl_picker_toggle_to_day_selection">Thepha ukuze ushintshe ekukhetheni usuku</string>
   <string name="mtrl_picker_day_of_week_column_header">Ikholomu yezinsuku: %1$s</string>
   <string name="mtrl_picker_announce_current_selection">Ukukhetha kwamanje: %1$s</string>
-  <string name="mtrl_picker_announce_current_range_selection">Ukukhethwa kosuku lokuqala: %1$s – Ukukhethwa kosuku lokuphela: %2$s</string>
-  <string name="mtrl_picker_announce_current_selection_none">lutho</string>
-  <string name="mtrl_picker_navigate_to_year_description">Zulela onyakeni %1$d</string>
-  <string name="mtrl_picker_navigate_to_current_year_description">Funa onyakeni wamanje %1$d</string>
-  <string name="mtrl_picker_today_description">Namuhla %1$s</string>
-  <string name="mtrl_picker_start_date_description">Ilanga lokuqala %1$s</string>
-  <string name="mtrl_picker_end_date_description">Ilanga lokuphela %1$s</string>
+  <string name="mtrl_picker_navigate_to_year_description">Zulela onyakeni %1$s</string>
 </resources>
diff --git a/material/java/com/google/android/material/dialog/res/values-af/strings.xml b/material/java/com/google/android/material/dialog/res/values-af/strings.xml
index 417426dd2..6f0cac80f 100644
--- a/material/java/com/google/android/material/dialog/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-am/strings.xml b/material/java/com/google/android/material/dialog/res/values-am/strings.xml
index 484ecfa5b..c335317cb 100644
--- a/material/java/com/google/android/material/dialog/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ar/strings.xml b/material/java/com/google/android/material/dialog/res/values-ar/strings.xml
index 21c35b39c..6fbc0b659 100644
--- a/material/java/com/google/android/material/dialog/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-as/strings.xml b/material/java/com/google/android/material/dialog/res/values-as/strings.xml
index 156b6ebdb..ecdd26505 100644
--- a/material/java/com/google/android/material/dialog/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-az/strings.xml b/material/java/com/google/android/material/dialog/res/values-az/strings.xml
index 334674f27..15c8d0798 100644
--- a/material/java/com/google/android/material/dialog/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/dialog/res/values-b+es+419/strings.xml
index cea365bfa..ec47706e0 100644
--- a/material/java/com/google/android/material/dialog/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/dialog/res/values-b+sr+Latn/strings.xml
index 4ff020396..441c570b0 100644
--- a/material/java/com/google/android/material/dialog/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-be/strings.xml b/material/java/com/google/android/material/dialog/res/values-be/strings.xml
index 540d79c3b..204133c81 100644
--- a/material/java/com/google/android/material/dialog/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-bg/strings.xml b/material/java/com/google/android/material/dialog/res/values-bg/strings.xml
index ee812a244..fa44a10a9 100644
--- a/material/java/com/google/android/material/dialog/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-bn/strings.xml b/material/java/com/google/android/material/dialog/res/values-bn/strings.xml
index 706a8d5ff..445c17785 100644
--- a/material/java/com/google/android/material/dialog/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-bs/strings.xml b/material/java/com/google/android/material/dialog/res/values-bs/strings.xml
index fb16c7509..2fef0ad73 100644
--- a/material/java/com/google/android/material/dialog/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ca/strings.xml b/material/java/com/google/android/material/dialog/res/values-ca/strings.xml
index e8515dbae..dd33c82cd 100644
--- a/material/java/com/google/android/material/dialog/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-cs/strings.xml b/material/java/com/google/android/material/dialog/res/values-cs/strings.xml
index 610d13f2b..eee4fd54c 100644
--- a/material/java/com/google/android/material/dialog/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-da/strings.xml b/material/java/com/google/android/material/dialog/res/values-da/strings.xml
index cd8db2e0d..ebe057c87 100644
--- a/material/java/com/google/android/material/dialog/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-de/strings.xml b/material/java/com/google/android/material/dialog/res/values-de/strings.xml
index 25986a7e3..4167ad0de 100644
--- a/material/java/com/google/android/material/dialog/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-el/strings.xml b/material/java/com/google/android/material/dialog/res/values-el/strings.xml
index 3285d656e..8ea23139e 100644
--- a/material/java/com/google/android/material/dialog/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/dialog/res/values-en-rGB/strings.xml
index 3cef8a7a1..eb84fa17a 100644
--- a/material/java/com/google/android/material/dialog/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/dialog/res/values-es-rUS/strings.xml
index cea365bfa..ec47706e0 100644
--- a/material/java/com/google/android/material/dialog/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-es/strings.xml b/material/java/com/google/android/material/dialog/res/values-es/strings.xml
index 39aac73aa..9406a0c6d 100644
--- a/material/java/com/google/android/material/dialog/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-et/strings.xml b/material/java/com/google/android/material/dialog/res/values-et/strings.xml
index 779fd4e42..a9ef4ccde 100644
--- a/material/java/com/google/android/material/dialog/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-eu/strings.xml b/material/java/com/google/android/material/dialog/res/values-eu/strings.xml
index ca23d2d74..b69460bba 100644
--- a/material/java/com/google/android/material/dialog/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-fa/strings.xml b/material/java/com/google/android/material/dialog/res/values-fa/strings.xml
index dfc0d1cb9..a83a532bb 100644
--- a/material/java/com/google/android/material/dialog/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-fi/strings.xml b/material/java/com/google/android/material/dialog/res/values-fi/strings.xml
index 741d75132..afe12da74 100644
--- a/material/java/com/google/android/material/dialog/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/dialog/res/values-fr-rCA/strings.xml
index 2f41c65cc..6e3e76a8c 100644
--- a/material/java/com/google/android/material/dialog/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-fr/strings.xml b/material/java/com/google/android/material/dialog/res/values-fr/strings.xml
index 9692da5f2..07bd25af1 100644
--- a/material/java/com/google/android/material/dialog/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-gl/strings.xml b/material/java/com/google/android/material/dialog/res/values-gl/strings.xml
index 94bc694a9..423f18045 100644
--- a/material/java/com/google/android/material/dialog/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-gu/strings.xml b/material/java/com/google/android/material/dialog/res/values-gu/strings.xml
index 68e7c5c69..91c313b3a 100644
--- a/material/java/com/google/android/material/dialog/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-hi/strings.xml b/material/java/com/google/android/material/dialog/res/values-hi/strings.xml
index 39587fbf0..59c867fca 100644
--- a/material/java/com/google/android/material/dialog/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-hr/strings.xml b/material/java/com/google/android/material/dialog/res/values-hr/strings.xml
index 4ff020396..441c570b0 100644
--- a/material/java/com/google/android/material/dialog/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-hu/strings.xml b/material/java/com/google/android/material/dialog/res/values-hu/strings.xml
index ecdac5b47..a65420154 100644
--- a/material/java/com/google/android/material/dialog/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-hy/strings.xml b/material/java/com/google/android/material/dialog/res/values-hy/strings.xml
index 00a0ab683..36b918359 100644
--- a/material/java/com/google/android/material/dialog/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-in/strings.xml b/material/java/com/google/android/material/dialog/res/values-in/strings.xml
index 117b65c61..b07ef6a5d 100644
--- a/material/java/com/google/android/material/dialog/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-is/strings.xml b/material/java/com/google/android/material/dialog/res/values-is/strings.xml
index ef00f416a..e9ad43928 100644
--- a/material/java/com/google/android/material/dialog/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-it/strings.xml b/material/java/com/google/android/material/dialog/res/values-it/strings.xml
index 12880f597..ff29fbfa1 100644
--- a/material/java/com/google/android/material/dialog/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-iw/strings.xml b/material/java/com/google/android/material/dialog/res/values-iw/strings.xml
index cb6f481f9..c9a5509c5 100644
--- a/material/java/com/google/android/material/dialog/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ja/strings.xml b/material/java/com/google/android/material/dialog/res/values-ja/strings.xml
index b4097801e..6d50aea95 100644
--- a/material/java/com/google/android/material/dialog/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ka/strings.xml b/material/java/com/google/android/material/dialog/res/values-ka/strings.xml
index 2986eb34d..1fd8ae116 100644
--- a/material/java/com/google/android/material/dialog/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-kk/strings.xml b/material/java/com/google/android/material/dialog/res/values-kk/strings.xml
index 2fe3d7dcf..20a99b625 100644
--- a/material/java/com/google/android/material/dialog/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-km/strings.xml b/material/java/com/google/android/material/dialog/res/values-km/strings.xml
index 1fa5f83b6..4899ac569 100644
--- a/material/java/com/google/android/material/dialog/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-kn/strings.xml b/material/java/com/google/android/material/dialog/res/values-kn/strings.xml
index c23154b1a..707bef5d4 100644
--- a/material/java/com/google/android/material/dialog/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ko/strings.xml b/material/java/com/google/android/material/dialog/res/values-ko/strings.xml
index 83bd5a7b3..fbc6722d0 100644
--- a/material/java/com/google/android/material/dialog/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ky/strings.xml b/material/java/com/google/android/material/dialog/res/values-ky/strings.xml
index 19efd2651..a0b1db015 100644
--- a/material/java/com/google/android/material/dialog/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-lo/strings.xml b/material/java/com/google/android/material/dialog/res/values-lo/strings.xml
index b0a95ae1b..2eb5da379 100644
--- a/material/java/com/google/android/material/dialog/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-lt/strings.xml b/material/java/com/google/android/material/dialog/res/values-lt/strings.xml
index 46c8c55ab..57c210bd7 100644
--- a/material/java/com/google/android/material/dialog/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-lv/strings.xml b/material/java/com/google/android/material/dialog/res/values-lv/strings.xml
index b59afc589..d2236e292 100644
--- a/material/java/com/google/android/material/dialog/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-mk/strings.xml b/material/java/com/google/android/material/dialog/res/values-mk/strings.xml
index 871aae9d0..cd1ae1964 100644
--- a/material/java/com/google/android/material/dialog/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ml/strings.xml b/material/java/com/google/android/material/dialog/res/values-ml/strings.xml
index fb38137d6..34d602231 100644
--- a/material/java/com/google/android/material/dialog/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-mn/strings.xml b/material/java/com/google/android/material/dialog/res/values-mn/strings.xml
index d11d9a58a..ac66bd15d 100644
--- a/material/java/com/google/android/material/dialog/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-mr/strings.xml b/material/java/com/google/android/material/dialog/res/values-mr/strings.xml
index a303652b3..d37b5ed4d 100644
--- a/material/java/com/google/android/material/dialog/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ms/strings.xml b/material/java/com/google/android/material/dialog/res/values-ms/strings.xml
index 117b65c61..b07ef6a5d 100644
--- a/material/java/com/google/android/material/dialog/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-my/strings.xml b/material/java/com/google/android/material/dialog/res/values-my/strings.xml
index b487b1ef6..b8f6755e9 100644
--- a/material/java/com/google/android/material/dialog/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-nb/strings.xml b/material/java/com/google/android/material/dialog/res/values-nb/strings.xml
index f6cb663e0..307df921b 100644
--- a/material/java/com/google/android/material/dialog/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ne/strings.xml b/material/java/com/google/android/material/dialog/res/values-ne/strings.xml
index b95337db8..e266b57c5 100644
--- a/material/java/com/google/android/material/dialog/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-nl/strings.xml b/material/java/com/google/android/material/dialog/res/values-nl/strings.xml
index 9d255b223..054c7ae2e 100644
--- a/material/java/com/google/android/material/dialog/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-or/strings.xml b/material/java/com/google/android/material/dialog/res/values-or/strings.xml
index 156b6ebdb..ecdd26505 100644
--- a/material/java/com/google/android/material/dialog/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-pa/strings.xml b/material/java/com/google/android/material/dialog/res/values-pa/strings.xml
index a03e3c4f7..5e7517414 100644
--- a/material/java/com/google/android/material/dialog/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-pl/strings.xml b/material/java/com/google/android/material/dialog/res/values-pl/strings.xml
index 1e44bedaa..4c94699fb 100644
--- a/material/java/com/google/android/material/dialog/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/dialog/res/values-pt-rBR/strings.xml
index e43a222a3..f982ed310 100644
--- a/material/java/com/google/android/material/dialog/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/dialog/res/values-pt-rPT/strings.xml
index e43a222a3..f982ed310 100644
--- a/material/java/com/google/android/material/dialog/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ro/strings.xml b/material/java/com/google/android/material/dialog/res/values-ro/strings.xml
index f40b7fa45..c6ca43b89 100644
--- a/material/java/com/google/android/material/dialog/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ru/strings.xml b/material/java/com/google/android/material/dialog/res/values-ru/strings.xml
index c46e4128f..c637385d3 100644
--- a/material/java/com/google/android/material/dialog/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-si/strings.xml b/material/java/com/google/android/material/dialog/res/values-si/strings.xml
index 4571613aa..da343f5cd 100644
--- a/material/java/com/google/android/material/dialog/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-sk/strings.xml b/material/java/com/google/android/material/dialog/res/values-sk/strings.xml
index 0886f172f..838a83335 100644
--- a/material/java/com/google/android/material/dialog/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-sl/strings.xml b/material/java/com/google/android/material/dialog/res/values-sl/strings.xml
index 48776402d..2c134031f 100644
--- a/material/java/com/google/android/material/dialog/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-sq/strings.xml b/material/java/com/google/android/material/dialog/res/values-sq/strings.xml
index fc027b99b..3287903d0 100644
--- a/material/java/com/google/android/material/dialog/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-sr/strings.xml b/material/java/com/google/android/material/dialog/res/values-sr/strings.xml
index 2c6cb22c1..e76d05d87 100644
--- a/material/java/com/google/android/material/dialog/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-sv/strings.xml b/material/java/com/google/android/material/dialog/res/values-sv/strings.xml
index e8c412e4a..1b02556fb 100644
--- a/material/java/com/google/android/material/dialog/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-sw/strings.xml b/material/java/com/google/android/material/dialog/res/values-sw/strings.xml
index f9416c507..fe113f70d 100644
--- a/material/java/com/google/android/material/dialog/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ta/strings.xml b/material/java/com/google/android/material/dialog/res/values-ta/strings.xml
index 2ae86388a..91b82bba9 100644
--- a/material/java/com/google/android/material/dialog/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-te/strings.xml b/material/java/com/google/android/material/dialog/res/values-te/strings.xml
index 4fb1df0ef..d7c8f0f09 100644
--- a/material/java/com/google/android/material/dialog/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-th/strings.xml b/material/java/com/google/android/material/dialog/res/values-th/strings.xml
index b943bc985..57f68c4ea 100644
--- a/material/java/com/google/android/material/dialog/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-tl/strings.xml b/material/java/com/google/android/material/dialog/res/values-tl/strings.xml
index 43186cd01..652cebcbc 100644
--- a/material/java/com/google/android/material/dialog/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-tr/strings.xml b/material/java/com/google/android/material/dialog/res/values-tr/strings.xml
index 9de6cdab4..779a12294 100644
--- a/material/java/com/google/android/material/dialog/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-uk/strings.xml b/material/java/com/google/android/material/dialog/res/values-uk/strings.xml
index 58e4d4f22..c44877075 100644
--- a/material/java/com/google/android/material/dialog/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-ur/strings.xml b/material/java/com/google/android/material/dialog/res/values-ur/strings.xml
index 7c2e123ca..4a393c3f9 100644
--- a/material/java/com/google/android/material/dialog/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-uz/strings.xml b/material/java/com/google/android/material/dialog/res/values-uz/strings.xml
index 7c2079104..1b14ae413 100644
--- a/material/java/com/google/android/material/dialog/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-vi/strings.xml b/material/java/com/google/android/material/dialog/res/values-vi/strings.xml
index ff069530c..47e39f047 100644
--- a/material/java/com/google/android/material/dialog/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/dialog/res/values-zh-rCN/strings.xml
index 44ff58bc3..c6101422e 100644
--- a/material/java/com/google/android/material/dialog/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/dialog/res/values-zh-rHK/strings.xml
index c6e6f65e2..6f73a07bf 100644
--- a/material/java/com/google/android/material/dialog/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/dialog/res/values-zh-rTW/strings.xml
index d46792464..0ebd3eba1 100644
--- a/material/java/com/google/android/material/dialog/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/dialog/res/values-zu/strings.xml b/material/java/com/google/android/material/dialog/res/values-zu/strings.xml
index 12cf2bb9b..d867e781c 100644
--- a/material/java/com/google/android/material/dialog/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/dialog/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java b/material/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java
index 6808fbbf0..6c96c5a99 100644
--- a/material/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java
+++ b/material/java/com/google/android/material/floatingactionbutton/FloatingActionButtonImpl.java
@@ -372,9 +372,6 @@ void setShadowPaddingEnabled(boolean shadowPaddingEnabled) {
 
   void onElevationsChanged(
       float elevation, float hoveredFocusedTranslationZ, float pressedTranslationZ) {
-    // If there is currently a state animation, we want to end the animation by jumping
-    // the drawable to the current state before changing the elevation.
-    jumpDrawableToCurrentState();
     updatePadding();
     updateShapeElevation(elevation);
   }
diff --git a/material/java/com/google/android/material/internal/ViewUtils.java b/material/java/com/google/android/material/internal/ViewUtils.java
index 70bc3db65..cc1152684 100644
--- a/material/java/com/google/android/material/internal/ViewUtils.java
+++ b/material/java/com/google/android/material/internal/ViewUtils.java
@@ -80,16 +80,6 @@ public static void showKeyboard(@NonNull View view, boolean useWindowInsetsContr
     getInputMethodManager(view).showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
   }
 
-  public static void requestFocusAndShowKeyboard(@NonNull final View view) {
-    requestFocusAndShowKeyboard(view, /* useWindowInsetsController= */ true);
-  }
-
-  public static void requestFocusAndShowKeyboard(
-      @NonNull final View view, boolean useWindowInsetsController) {
-    view.requestFocus();
-    view.post(() -> showKeyboard(view, useWindowInsetsController));
-  }
-
   public static void hideKeyboard(@NonNull View view) {
     hideKeyboard(view, /* useWindowInsetsController= */ true);
   }
@@ -171,6 +161,20 @@ public static float dpToPx(@NonNull Context context, @Dimension(unit = Dimension
     return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, r.getDisplayMetrics());
   }
 
+  public static void requestFocusAndShowKeyboard(@NonNull final View view) {
+    view.requestFocus();
+    view.post(
+        new Runnable() {
+          @Override
+          public void run() {
+            InputMethodManager inputMethodManager =
+                (InputMethodManager)
+                    view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
+            inputMethodManager.showSoftInput(view, InputMethodManager.SHOW_IMPLICIT);
+          }
+        });
+  }
+
   /**
    * Wrapper around {@link androidx.core.view.OnApplyWindowInsetsListener} which also passes the
    * initial padding set on the view. Used with {@link #doOnApplyWindowInsets(View,
diff --git a/material/java/com/google/android/material/navigation/NavigationView.java b/material/java/com/google/android/material/navigation/NavigationView.java
index 3a4f98034..87f448983 100644
--- a/material/java/com/google/android/material/navigation/NavigationView.java
+++ b/material/java/com/google/android/material/navigation/NavigationView.java
@@ -130,7 +130,6 @@ public class NavigationView extends ScrimInsetsFrameLayout {
 
   private int layoutGravity = Gravity.NO_GRAVITY;
   @Px private int drawerLayoutCornerSize = 0;
-  private boolean drawerLayoutCornerClippingEnabled = false;
 
   @Nullable private Path shapeClipPath;
   private final RectF shapeClipBounds = new RectF();
@@ -154,7 +153,11 @@ public NavigationView(@NonNull Context context, @Nullable AttributeSet attrs, in
     // Custom attributes
     TintTypedArray a =
         ThemeEnforcement.obtainTintedStyledAttributes(
-            context, attrs, R.styleable.NavigationView, defStyleAttr, DEF_STYLE_RES);
+            context,
+            attrs,
+            R.styleable.NavigationView,
+            defStyleAttr,
+            DEF_STYLE_RES);
 
     if (a.hasValue(R.styleable.NavigationView_android_background)) {
       ViewCompat.setBackground(this, a.getDrawable(R.styleable.NavigationView_android_background));
@@ -163,12 +166,9 @@ public NavigationView(@NonNull Context context, @Nullable AttributeSet attrs, in
     // Get the drawer layout corner size and layout gravity to be used to shape the exposed corners
     // of this view when placed inside a drawer layout.
     drawerLayoutCornerSize =
-        a.getDimensionPixelSize(R.styleable.NavigationView_drawerLayoutCornerSize, 0);
+        a.getDimensionPixelSize(
+            R.styleable.NavigationView_drawerLayoutCornerSize, 0);
     layoutGravity = a.getInt(R.styleable.NavigationView_android_layout_gravity, Gravity.NO_GRAVITY);
-    setDrawerLayoutCornerClippingEnabled(
-        a.getBoolean(
-            R.styleable.NavigationView_drawerLayoutCornerClippingEnabled,
-            drawerLayoutCornerClippingEnabled));
 
     // Set the background to a MaterialShapeDrawable if it hasn't been set or if it can be converted
     // to a MaterialShapeDrawable.
@@ -204,7 +204,7 @@ public NavigationView(@NonNull Context context, @Nullable AttributeSet attrs, in
     }
 
     if (subheaderTextAppearance == NavigationMenuPresenter.NO_TEXT_APPEARANCE_SET
-        && subheaderColor == null) {
+            && subheaderColor == null) {
       // If there isn't a text appearance set, we'll use a default text color
       subheaderColor = createDefaultColorStateList(android.R.attr.textColorSecondary);
     }
@@ -241,18 +241,18 @@ public NavigationView(@NonNull Context context, @Nullable AttributeSet attrs, in
     if (itemBackground == null && hasShapeAppearance(a)) {
       itemBackground = createDefaultItemBackground(a);
 
-      ColorStateList itemRippleColor =
-          MaterialResources.getColorStateList(
-              context, a, R.styleable.NavigationView_itemRippleColor);
+      ColorStateList itemRippleColor = MaterialResources.getColorStateList(
+          context, a, R.styleable.NavigationView_itemRippleColor);
 
       // Use a ripple matching the item's shape as the foreground for api level 21+ and if a ripple
       // color is set. Otherwise the selectableItemBackground foreground from the item layout will
       // be used
       if (VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP && itemRippleColor != null) {
         Drawable itemRippleMask = createDefaultItemDrawable(a, null);
-        RippleDrawable ripple =
-            new RippleDrawable(
-                RippleUtils.sanitizeRippleDrawableColor(itemRippleColor), null, itemRippleMask);
+        RippleDrawable ripple = new RippleDrawable(
+            RippleUtils.sanitizeRippleDrawableColor(itemRippleColor),
+            null,
+            itemRippleMask);
         presenter.setItemForeground(ripple);
       }
     }
@@ -289,7 +289,8 @@ public NavigationView(@NonNull Context context, @Nullable AttributeSet attrs, in
         a.getBoolean(R.styleable.NavigationView_topInsetScrimEnabled, topInsetScrimEnabled));
 
     setBottomInsetScrimEnabled(
-        a.getBoolean(R.styleable.NavigationView_bottomInsetScrimEnabled, bottomInsetScrimEnabled));
+        a.getBoolean(R.styleable.NavigationView_bottomInsetScrimEnabled, bottomInsetScrimEnabled)
+    );
 
     final int itemIconPadding =
         a.getDimensionPixelSize(R.styleable.NavigationView_itemIconPadding, 0);
@@ -344,37 +345,6 @@ public void setOverScrollMode(int overScrollMode) {
     }
   }
 
-  /**
-   * Gets whether NavigationView will clip itself and its children to its shape appearance and
-   * drawer layout corner size.
-   *
-   * <p>See {@link #setDrawerLayoutCornerClippingEnabled(boolean)}.
-   *
-   * @return true if this view will clip itself and its children to its shape appearance and drawer
-   *     layout corner size
-   */
-  public boolean isDrawerLayoutCornerClippingEnabled() {
-    return drawerLayoutCornerClippingEnabled;
-  }
-
-  /**
-   * Sets whether NavigationView should clip itself and its children to its shape appearance and
-   * drawer layout corner size.
-   *
-   * <p>Clipping uses {@link Canvas#clipPath(Path)} which is expensive and should be used only when
-   * necessary. The most common example of this is when using a header layout with a full bleed
-   * image or other content that would obscure the top end corner shape.
-   *
-   * @param enabled true if navigation view should use canvas clipping to clip itself and all
-   *     children to its shape appearance and drawer layout corner size.
-   */
-  public void setDrawerLayoutCornerClippingEnabled(boolean enabled) {
-    if (drawerLayoutCornerClippingEnabled != enabled) {
-      drawerLayoutCornerClippingEnabled = enabled;
-      invalidate();
-    }
-  }
-
   /**
    * Determine whether this view is placed inside a drawer layout and should have its exposed
    * corners shaped according to the <code>app:drawerLayoutCornerSize</code> attribute.
@@ -387,7 +357,8 @@ private void maybeUpdateCornerSizeForDrawerLayout(@Px int width, @Px int height)
         && getBackground() instanceof MaterialShapeDrawable) {
       // Get the absolute gravity of this view and set the top and bottom exposed corner sizes.
       MaterialShapeDrawable background = (MaterialShapeDrawable) getBackground();
-      ShapeAppearanceModel.Builder builder = background.getShapeAppearanceModel().toBuilder();
+      ShapeAppearanceModel.Builder builder =
+          background.getShapeAppearanceModel().toBuilder();
       int absGravity =
           GravityCompat.getAbsoluteGravity(layoutGravity, ViewCompat.getLayoutDirection(this));
       if (absGravity == Gravity.LEFT) {
@@ -452,9 +423,8 @@ public void setElevation(float elevation) {
    */
   @NonNull
   private Drawable createDefaultItemBackground(@NonNull TintTypedArray a) {
-    ColorStateList fillColor =
-        MaterialResources.getColorStateList(
-            getContext(), a, R.styleable.NavigationView_itemShapeFillColor);
+    ColorStateList fillColor = MaterialResources.getColorStateList(
+        getContext(), a, R.styleable.NavigationView_itemShapeFillColor);
     return createDefaultItemDrawable(a, fillColor);
   }
 
@@ -467,7 +437,7 @@ private Drawable createDefaultItemDrawable(
     MaterialShapeDrawable materialShapeDrawable =
         new MaterialShapeDrawable(
             ShapeAppearanceModel.builder(
-                    getContext(), shapeAppearanceResId, shapeAppearanceOverlayResId)
+                getContext(), shapeAppearanceResId, shapeAppearanceOverlayResId)
                 .build());
     materialShapeDrawable.setFillColor(fillColor);
 
@@ -529,7 +499,7 @@ protected void onMeasure(int widthSpec, int heightSpec) {
 
   @Override
   protected void dispatchDraw(@NonNull Canvas canvas) {
-    if (shapeClipPath == null || !isDrawerLayoutCornerClippingEnabled()) {
+    if (shapeClipPath == null) {
       super.dispatchDraw(canvas);
       return;
     }
@@ -852,14 +822,16 @@ public int getItemMaxLines() {
     return presenter.getItemMaxLines();
   }
 
-  /** Whether or not the NavigationView will draw a scrim behind the window's top inset. */
+  /**
+   * Whether or not the NavigationView will draw a scrim behind the window's top inset.
+   */
   public boolean isTopInsetScrimEnabled() {
     return this.topInsetScrimEnabled;
   }
 
   /**
-   * Set whether or not the NavigationView should draw a scrim behind the window's top inset
-   * (typically the status bar).
+   * Set whether or not the NavigationView should draw a scrim behind the window's top
+   * inset (typically the status bar).
    *
    * @param enabled true when the NavigationView should draw a scrim.
    */
@@ -867,14 +839,16 @@ public void setTopInsetScrimEnabled(boolean enabled) {
     this.topInsetScrimEnabled = enabled;
   }
 
-  /** Whether or not the NavigationView will draw a scrim behind the window's bottom inset. */
+  /**
+   * Whether or not the NavigationView will draw a scrim behind the window's bottom inset.
+   */
   public boolean isBottomInsetScrimEnabled() {
     return this.bottomInsetScrimEnabled;
   }
 
   /**
-   * Set whether or not the NavigationView should draw a scrim behind the window's bottom inset
-   * (typically the navigation bar)
+   * Set whether or not the NavigationView should draw a scrim behind the window's bottom
+   * inset (typically the navigation bar)
    *
    * @param enabled true when the NavigationView should draw a scrim.
    */
@@ -897,35 +871,47 @@ public void setDividerInsetStart(@Px int dividerInsetStart) {
     presenter.setDividerInsetStart(dividerInsetStart);
   }
 
-  /** Get the distance between the end of a divider and the end of the NavigationView. */
+  /**
+   * Get the distance between the end of a divider and the end of the NavigationView.
+   */
   @Px
   public int getDividerInsetEnd() {
     return presenter.getDividerInsetEnd();
   }
 
-  /** Set the distance between the end of a divider and the end of the NavigationView. */
+  /**
+   * Set the distance between the end of a divider and the end of the NavigationView.
+   */
   public void setDividerInsetEnd(@Px int dividerInsetEnd) {
     presenter.setDividerInsetEnd(dividerInsetEnd);
   }
 
-  /** Get the distance between the start of the NavigationView and the start of a menu subheader. */
+  /**
+   * Get the distance between the start of the NavigationView and the start of a menu subheader.
+   */
   @Px
   public int getSubheaderInsetStart() {
     return presenter.getSubheaderInsetStart();
   }
 
-  /** Set the distance between the start of the NavigationView and the start of a menu subheader. */
+  /**
+   * Set the distance between the start of the NavigationView and the start of a menu subheader.
+   */
   public void setSubheaderInsetStart(@Px int subheaderInsetStart) {
     presenter.setSubheaderInsetStart(subheaderInsetStart);
   }
 
-  /** Get the distance between the end of a menu subheader and the end of the NavigationView. */
+  /**
+   * Get the distance between the end of a menu subheader and the end of the NavigationView.
+   */
   @Px
   public int getSubheaderInsetEnd() {
     return presenter.getSubheaderInsetEnd();
   }
 
-  /** Set the distance between the end of a menu subheader and the end of the NavigationView. */
+  /**
+   * Set the distance between the end of a menu subheader and the end of the NavigationView.
+   */
   public void setSubheaderInsetEnd(@Px int subheaderInsetEnd) {
     presenter.setSubheaderInsetEnd(subheaderInsetEnd);
   }
@@ -992,7 +978,8 @@ public void onGlobalLayout() {
             if (activity != null && VERSION.SDK_INT >= VERSION_CODES.LOLLIPOP) {
               Rect displayBounds = WindowUtils.getCurrentWindowBounds(activity);
 
-              boolean isBehindSystemNav = displayBounds.height() - getHeight() == tmpLocation[1];
+              boolean isBehindSystemNav =
+                  displayBounds.height() - getHeight() == tmpLocation[1];
               boolean hasNonZeroAlpha =
                   Color.alpha(activity.getWindow().getNavigationBarColor()) != 0;
               setDrawBottomInsetForeground(
@@ -1009,7 +996,9 @@ public void onGlobalLayout() {
           }
         };
 
-    getViewTreeObserver().addOnGlobalLayoutListener(onGlobalLayoutListener);
+    getViewTreeObserver()
+        .addOnGlobalLayoutListener(
+            onGlobalLayoutListener);
   }
 
   /** Listener for handling events on navigation items. */
diff --git a/material/java/com/google/android/material/navigation/res-public/values/public.xml b/material/java/com/google/android/material/navigation/res-public/values/public.xml
index 633f33368..d546ec464 100644
--- a/material/java/com/google/android/material/navigation/res-public/values/public.xml
+++ b/material/java/com/google/android/material/navigation/res-public/values/public.xml
@@ -44,7 +44,6 @@
   <public name="subheaderInsetStart" type="attr"/>
   <public name="subheaderInsetEnd" type="attr"/>
   <public name="drawerLayoutCornerSize" type="attr"/>
-  <public name="drawerLayoutCornerClippingEnabled" type="attr"/>
   <public name="Widget.Design.NavigationView" type="style"/>
   <public name="Widget.Material3.NavigationView" type="style"/>
   <public name="ShapeAppearanceOverlay.Material3.NavigationView.Item" type="style"/>
diff --git a/material/java/com/google/android/material/navigation/res/values/attrs.xml b/material/java/com/google/android/material/navigation/res/values/attrs.xml
index c4409e9e8..c3f6d0617 100644
--- a/material/java/com/google/android/material/navigation/res/values/attrs.xml
+++ b/material/java/com/google/android/material/navigation/res/values/attrs.xml
@@ -167,8 +167,5 @@
     <!-- Corner size for the exposed corners (those not attached to the side
          of the screen) when the navigation view is placed inside a drawer layout.-->
     <attr name="drawerLayoutCornerSize" format="dimension"/>
-    <!-- True if the navigation view should use clip children to its shape
-         appearance and drawerLayoutCornerSize.-->
-    <attr name="drawerLayoutCornerClippingEnabled" format="boolean"/>
   </declare-styleable>
 </resources>
diff --git a/material/java/com/google/android/material/resources/res/values-af/strings.xml b/material/java/com/google/android/material/resources/res/values-af/strings.xml
index 645c1781d..bbe64fc26 100644
--- a/material/java/com/google/android/material/resources/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-am/strings.xml b/material/java/com/google/android/material/resources/res/values-am/strings.xml
index 0e0e2025e..b97f685eb 100644
--- a/material/java/com/google/android/material/resources/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ar/strings.xml b/material/java/com/google/android/material/resources/res/values-ar/strings.xml
index 65ee2c550..dfb632420 100644
--- a/material/java/com/google/android/material/resources/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-as/strings.xml b/material/java/com/google/android/material/resources/res/values-as/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-az/strings.xml b/material/java/com/google/android/material/resources/res/values-az/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/resources/res/values-b+es+419/strings.xml
index 11dc1e3d2..4fcc79989 100644
--- a/material/java/com/google/android/material/resources/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/resources/res/values-b+sr+Latn/strings.xml
index 7853c3677..8449f7bef 100644
--- a/material/java/com/google/android/material/resources/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-be/strings.xml b/material/java/com/google/android/material/resources/res/values-be/strings.xml
index dee1dde71..fb110384b 100644
--- a/material/java/com/google/android/material/resources/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-bg/strings.xml b/material/java/com/google/android/material/resources/res/values-bg/strings.xml
index cc2a53169..796da24e9 100644
--- a/material/java/com/google/android/material/resources/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-bn/strings.xml b/material/java/com/google/android/material/resources/res/values-bn/strings.xml
index 885908e89..b16eb00a8 100644
--- a/material/java/com/google/android/material/resources/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-bs/strings.xml b/material/java/com/google/android/material/resources/res/values-bs/strings.xml
index 7853c3677..8449f7bef 100644
--- a/material/java/com/google/android/material/resources/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ca/strings.xml b/material/java/com/google/android/material/resources/res/values-ca/strings.xml
index c828bc624..1ffcc5623 100644
--- a/material/java/com/google/android/material/resources/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-cs/strings.xml b/material/java/com/google/android/material/resources/res/values-cs/strings.xml
index b8bc335de..71e389146 100644
--- a/material/java/com/google/android/material/resources/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-da/strings.xml b/material/java/com/google/android/material/resources/res/values-da/strings.xml
index 01ab9be5c..24dca9b3a 100644
--- a/material/java/com/google/android/material/resources/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-de/strings.xml b/material/java/com/google/android/material/resources/res/values-de/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-el/strings.xml b/material/java/com/google/android/material/resources/res/values-el/strings.xml
index e31d7b69d..96ff24e83 100644
--- a/material/java/com/google/android/material/resources/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/resources/res/values-en-rGB/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/resources/res/values-es-rUS/strings.xml
index 11dc1e3d2..4fcc79989 100644
--- a/material/java/com/google/android/material/resources/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-es/strings.xml b/material/java/com/google/android/material/resources/res/values-es/strings.xml
index 11dc1e3d2..4fcc79989 100644
--- a/material/java/com/google/android/material/resources/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-et/strings.xml b/material/java/com/google/android/material/resources/res/values-et/strings.xml
index e8946caac..0e94022a5 100644
--- a/material/java/com/google/android/material/resources/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-eu/strings.xml b/material/java/com/google/android/material/resources/res/values-eu/strings.xml
index 359205073..e7147a992 100644
--- a/material/java/com/google/android/material/resources/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-fa/strings.xml b/material/java/com/google/android/material/resources/res/values-fa/strings.xml
index 6c9e0f7ed..d1b4b1f27 100644
--- a/material/java/com/google/android/material/resources/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-fi/strings.xml b/material/java/com/google/android/material/resources/res/values-fi/strings.xml
index 87ae5e3e7..3ba5bb392 100644
--- a/material/java/com/google/android/material/resources/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/resources/res/values-fr-rCA/strings.xml
index 5774f95c3..5ddf400ab 100644
--- a/material/java/com/google/android/material/resources/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-fr/strings.xml b/material/java/com/google/android/material/resources/res/values-fr/strings.xml
index 26f4b6591..b16cfcb7a 100644
--- a/material/java/com/google/android/material/resources/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-gl/strings.xml b/material/java/com/google/android/material/resources/res/values-gl/strings.xml
index 87f18bb3d..2ab38f8da 100644
--- a/material/java/com/google/android/material/resources/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-gu/strings.xml b/material/java/com/google/android/material/resources/res/values-gu/strings.xml
index 6e9667a03..292a75c3e 100644
--- a/material/java/com/google/android/material/resources/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-hi/strings.xml b/material/java/com/google/android/material/resources/res/values-hi/strings.xml
index 3d3b51e3a..d8e0b8005 100644
--- a/material/java/com/google/android/material/resources/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-hr/strings.xml b/material/java/com/google/android/material/resources/res/values-hr/strings.xml
index 7853c3677..8449f7bef 100644
--- a/material/java/com/google/android/material/resources/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-hu/strings.xml b/material/java/com/google/android/material/resources/res/values-hu/strings.xml
index 5865eb7fd..97a65a862 100644
--- a/material/java/com/google/android/material/resources/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-hy/strings.xml b/material/java/com/google/android/material/resources/res/values-hy/strings.xml
index 5321291f0..5f48c4a0e 100644
--- a/material/java/com/google/android/material/resources/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-in/strings.xml b/material/java/com/google/android/material/resources/res/values-in/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-is/strings.xml b/material/java/com/google/android/material/resources/res/values-is/strings.xml
index cd90b12d3..57a03dd5f 100644
--- a/material/java/com/google/android/material/resources/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-it/strings.xml b/material/java/com/google/android/material/resources/res/values-it/strings.xml
index d448b8977..18d48478e 100644
--- a/material/java/com/google/android/material/resources/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-iw/strings.xml b/material/java/com/google/android/material/resources/res/values-iw/strings.xml
index 0812dca1a..eb6254473 100644
--- a/material/java/com/google/android/material/resources/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ja/strings.xml b/material/java/com/google/android/material/resources/res/values-ja/strings.xml
index eee45651a..b1821d7ef 100644
--- a/material/java/com/google/android/material/resources/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ka/strings.xml b/material/java/com/google/android/material/resources/res/values-ka/strings.xml
index 3ef69fb6f..f7522d5a6 100644
--- a/material/java/com/google/android/material/resources/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-kk/strings.xml b/material/java/com/google/android/material/resources/res/values-kk/strings.xml
index 0b176ecc7..425349d5d 100644
--- a/material/java/com/google/android/material/resources/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-km/strings.xml b/material/java/com/google/android/material/resources/res/values-km/strings.xml
index f46643be9..de8516bbe 100644
--- a/material/java/com/google/android/material/resources/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-kn/strings.xml b/material/java/com/google/android/material/resources/res/values-kn/strings.xml
index 527ec3caf..ae4fe7819 100644
--- a/material/java/com/google/android/material/resources/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ko/strings.xml b/material/java/com/google/android/material/resources/res/values-ko/strings.xml
index 245fe93af..aad69e615 100644
--- a/material/java/com/google/android/material/resources/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ky/strings.xml b/material/java/com/google/android/material/resources/res/values-ky/strings.xml
index 3b3f22ce4..bd83b1f2f 100644
--- a/material/java/com/google/android/material/resources/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-lo/strings.xml b/material/java/com/google/android/material/resources/res/values-lo/strings.xml
index d750ff97b..5f2637ccc 100644
--- a/material/java/com/google/android/material/resources/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-lt/strings.xml b/material/java/com/google/android/material/resources/res/values-lt/strings.xml
index bbf761157..86086caa8 100644
--- a/material/java/com/google/android/material/resources/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-lv/strings.xml b/material/java/com/google/android/material/resources/res/values-lv/strings.xml
index 23610af7c..fd5a2d0c1 100644
--- a/material/java/com/google/android/material/resources/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-mk/strings.xml b/material/java/com/google/android/material/resources/res/values-mk/strings.xml
index 8f3d52166..514f31a9d 100644
--- a/material/java/com/google/android/material/resources/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ml/strings.xml b/material/java/com/google/android/material/resources/res/values-ml/strings.xml
index 06f7f901e..17e3ec324 100644
--- a/material/java/com/google/android/material/resources/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-mn/strings.xml b/material/java/com/google/android/material/resources/res/values-mn/strings.xml
index 4215905c4..686195862 100644
--- a/material/java/com/google/android/material/resources/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-mr/strings.xml b/material/java/com/google/android/material/resources/res/values-mr/strings.xml
index 6347a48c6..126a17345 100644
--- a/material/java/com/google/android/material/resources/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ms/strings.xml b/material/java/com/google/android/material/resources/res/values-ms/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-my/strings.xml b/material/java/com/google/android/material/resources/res/values-my/strings.xml
index 8176e1ee8..c71253a10 100644
--- a/material/java/com/google/android/material/resources/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-nb/strings.xml b/material/java/com/google/android/material/resources/res/values-nb/strings.xml
index 01ab9be5c..24dca9b3a 100644
--- a/material/java/com/google/android/material/resources/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ne/strings.xml b/material/java/com/google/android/material/resources/res/values-ne/strings.xml
index f6b2faf8e..718453394 100644
--- a/material/java/com/google/android/material/resources/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-nl/strings.xml b/material/java/com/google/android/material/resources/res/values-nl/strings.xml
index f26fef9d2..c15d79a6c 100644
--- a/material/java/com/google/android/material/resources/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-or/strings.xml b/material/java/com/google/android/material/resources/res/values-or/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-pa/strings.xml b/material/java/com/google/android/material/resources/res/values-pa/strings.xml
index cfde0688b..d1ab0cfd0 100644
--- a/material/java/com/google/android/material/resources/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-pl/strings.xml b/material/java/com/google/android/material/resources/res/values-pl/strings.xml
index b8bc335de..71e389146 100644
--- a/material/java/com/google/android/material/resources/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/resources/res/values-pt-rBR/strings.xml
index c66432aac..68183e8c6 100644
--- a/material/java/com/google/android/material/resources/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/resources/res/values-pt-rPT/strings.xml
index af5818e49..2110f3a1d 100644
--- a/material/java/com/google/android/material/resources/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ro/strings.xml b/material/java/com/google/android/material/resources/res/values-ro/strings.xml
index a80d3f917..3a5a7eabf 100644
--- a/material/java/com/google/android/material/resources/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ru/strings.xml b/material/java/com/google/android/material/resources/res/values-ru/strings.xml
index 982ab0334..dd5d34218 100644
--- a/material/java/com/google/android/material/resources/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-si/strings.xml b/material/java/com/google/android/material/resources/res/values-si/strings.xml
index 5c7e7e9bc..db29c5a00 100644
--- a/material/java/com/google/android/material/resources/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-sk/strings.xml b/material/java/com/google/android/material/resources/res/values-sk/strings.xml
index 051cafcde..d40dce87a 100644
--- a/material/java/com/google/android/material/resources/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-sl/strings.xml b/material/java/com/google/android/material/resources/res/values-sl/strings.xml
index 45cacdd45..a3bed297b 100644
--- a/material/java/com/google/android/material/resources/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-sq/strings.xml b/material/java/com/google/android/material/resources/res/values-sq/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-sr/strings.xml b/material/java/com/google/android/material/resources/res/values-sr/strings.xml
index 096d43a3d..5c8b411ff 100644
--- a/material/java/com/google/android/material/resources/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-sv/strings.xml b/material/java/com/google/android/material/resources/res/values-sv/strings.xml
index d9b071b92..1c26e1683 100644
--- a/material/java/com/google/android/material/resources/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-sw/strings.xml b/material/java/com/google/android/material/resources/res/values-sw/strings.xml
index 87915fe12..7410250c2 100644
--- a/material/java/com/google/android/material/resources/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ta/strings.xml b/material/java/com/google/android/material/resources/res/values-ta/strings.xml
index 4f69656a1..0c6c758c2 100644
--- a/material/java/com/google/android/material/resources/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-te/strings.xml b/material/java/com/google/android/material/resources/res/values-te/strings.xml
index ae830249c..acec88f2b 100644
--- a/material/java/com/google/android/material/resources/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-th/strings.xml b/material/java/com/google/android/material/resources/res/values-th/strings.xml
index 5ae216487..6aa6ff1a7 100644
--- a/material/java/com/google/android/material/resources/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-tl/strings.xml b/material/java/com/google/android/material/resources/res/values-tl/strings.xml
index 2d2e17f68..41144248f 100644
--- a/material/java/com/google/android/material/resources/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-tr/strings.xml b/material/java/com/google/android/material/resources/res/values-tr/strings.xml
index abf80a4db..3714409a8 100644
--- a/material/java/com/google/android/material/resources/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-uk/strings.xml b/material/java/com/google/android/material/resources/res/values-uk/strings.xml
index 982ab0334..dd5d34218 100644
--- a/material/java/com/google/android/material/resources/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-ur/strings.xml b/material/java/com/google/android/material/resources/res/values-ur/strings.xml
index 545be7210..e7b5c9af9 100644
--- a/material/java/com/google/android/material/resources/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-uz/strings.xml b/material/java/com/google/android/material/resources/res/values-uz/strings.xml
index a191a8d9d..5ea4c829a 100644
--- a/material/java/com/google/android/material/resources/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-vi/strings.xml b/material/java/com/google/android/material/resources/res/values-vi/strings.xml
index ead7839f3..7bd1f20f5 100644
--- a/material/java/com/google/android/material/resources/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/resources/res/values-zh-rCN/strings.xml
index baaca737a..39dc2fb79 100644
--- a/material/java/com/google/android/material/resources/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/resources/res/values-zh-rHK/strings.xml
index c5105f1a0..a10f33003 100644
--- a/material/java/com/google/android/material/resources/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/resources/res/values-zh-rTW/strings.xml
index 4c3465d4c..a74fd694f 100644
--- a/material/java/com/google/android/material/resources/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/resources/res/values-zu/strings.xml b/material/java/com/google/android/material/resources/res/values-zu/strings.xml
index 4a83cbb01..a5d5478d7 100644
--- a/material/java/com/google/android/material/resources/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/resources/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/shape/ClampedCornerSize.java b/material/java/com/google/android/material/shape/ClampedCornerSize.java
new file mode 100644
index 000000000..9491611a9
--- /dev/null
+++ b/material/java/com/google/android/material/shape/ClampedCornerSize.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2023 The Android Open Source Project
+ *
+ * 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.
+ */
+
+package com.google.android.material.shape;
+
+import static androidx.annotation.RestrictTo.Scope.LIBRARY_GROUP;
+import static java.lang.Math.min;
+
+import android.graphics.RectF;
+import androidx.annotation.NonNull;
+import androidx.annotation.RestrictTo;
+import java.util.Arrays;
+
+/**
+ * A {@link CornerSize} that takes a desired absolute corner size and clamps the value to be no
+ * larger than half the length of the shortest edge (fully rounded/cut).
+ *
+ * @hide
+ */
+@RestrictTo(LIBRARY_GROUP)
+public final class ClampedCornerSize implements CornerSize {
+
+  private final float target;
+
+  /**
+   * Create a new {@link ClampedCornerSize} from an {@link AbsoluteCornerSize}.
+   *
+   * @param cornerSize the absolute corner size to clamp
+   * @return a new clamped corner size
+   */
+  @NonNull
+  public static ClampedCornerSize createFromCornerSize(
+      @NonNull final AbsoluteCornerSize cornerSize) {
+    return new ClampedCornerSize(cornerSize.getCornerSize());
+  }
+
+  private static float getMaxCornerSize(@NonNull RectF bounds) {
+    return min(bounds.width() / 2F, bounds.height() / 2F);
+  }
+
+  public ClampedCornerSize(float target) {
+    this.target = target;
+  }
+
+  @Override
+  public float getCornerSize(@NonNull RectF bounds) {
+    return min(target, getMaxCornerSize(bounds));
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof ClampedCornerSize)) {
+      return false;
+    }
+    ClampedCornerSize that = (ClampedCornerSize) o;
+    return target == that.target;
+  }
+
+  @Override
+  public int hashCode() {
+    Object[] hashedFields = {target};
+    return Arrays.hashCode(hashedFields);
+  }
+}
diff --git a/material/java/com/google/android/material/textfield/EndCompoundLayout.java b/material/java/com/google/android/material/textfield/EndCompoundLayout.java
index 7465f87e3..fb119d70c 100644
--- a/material/java/com/google/android/material/textfield/EndCompoundLayout.java
+++ b/material/java/com/google/android/material/textfield/EndCompoundLayout.java
@@ -737,21 +737,6 @@ void updateSuffixTextViewPadding() {
         textInputLayout.editText.getPaddingBottom());
   }
 
-  int getSuffixTextEndOffset() {
-    int endIconOffset;
-    if (isEndIconVisible() || isErrorIconVisible()) {
-      endIconOffset =
-          endIconView.getMeasuredWidth()
-              + MarginLayoutParamsCompat.getMarginStart(
-              (MarginLayoutParams) endIconView.getLayoutParams());
-    } else {
-      endIconOffset = 0;
-    }
-    return ViewCompat.getPaddingEnd(this)
-        + ViewCompat.getPaddingEnd(suffixTextView)
-        + endIconOffset;
-  }
-
   @Nullable
   CheckableImageButton getCurrentEndIconView() {
     if (isErrorIconVisible()) {
diff --git a/material/java/com/google/android/material/textfield/StartCompoundLayout.java b/material/java/com/google/android/material/textfield/StartCompoundLayout.java
index 61f0df192..ebf845551 100644
--- a/material/java/com/google/android/material/textfield/StartCompoundLayout.java
+++ b/material/java/com/google/android/material/textfield/StartCompoundLayout.java
@@ -328,21 +328,6 @@ void updatePrefixTextViewPadding() {
         editText.getCompoundPaddingBottom());
   }
 
-  int getPrefixTextStartOffset() {
-    int startIconOffset;
-    if (isStartIconVisible()) {
-      startIconOffset =
-          startIconView.getMeasuredWidth()
-              + MarginLayoutParamsCompat.getMarginEnd(
-                  (MarginLayoutParams) startIconView.getLayoutParams());
-    } else {
-      startIconOffset = 0;
-    }
-    return ViewCompat.getPaddingStart(this)
-        + ViewCompat.getPaddingStart(prefixTextView)
-        + startIconOffset;
-  }
-
   void onHintStateChanged(boolean hintExpanded) {
     this.hintExpanded = hintExpanded;
     updateVisibility();
diff --git a/material/java/com/google/android/material/textfield/TextInputLayout.java b/material/java/com/google/android/material/textfield/TextInputLayout.java
index acda4ac93..f1032ad26 100644
--- a/material/java/com/google/android/material/textfield/TextInputLayout.java
+++ b/material/java/com/google/android/material/textfield/TextInputLayout.java
@@ -2769,37 +2769,35 @@ private Rect calculateCollapsedTextBounds(@NonNull Rect rect) {
         bounds.right = rect.right - editText.getPaddingRight();
         return bounds;
       case BOX_BACKGROUND_FILLED:
-        bounds.left = getLabelLeftBoundAlignedWithPrefixAndSuffix(rect.left, isRtl);
+        bounds.left = getLabelLeftBoundAlightWithPrefix(rect.left, isRtl);
         bounds.top = rect.top + boxCollapsedPaddingTopPx;
-        bounds.right = getLabelRightBoundAlignedWithPrefixAndSuffix(rect.right, isRtl);
+        bounds.right = getLabelRightBoundAlignedWithSuffix(rect.right, isRtl);
         return bounds;
       case BOX_BACKGROUND_NONE:
       default:
-        bounds.left = getLabelLeftBoundAlignedWithPrefixAndSuffix(rect.left, isRtl);
+        bounds.left = getLabelLeftBoundAlightWithPrefix(rect.left, isRtl);
         bounds.top = getPaddingTop();
-        bounds.right = getLabelRightBoundAlignedWithPrefixAndSuffix(rect.right, isRtl);
+        bounds.right = getLabelRightBoundAlignedWithSuffix(rect.right, isRtl);
         return bounds;
     }
   }
 
-  private int getLabelLeftBoundAlignedWithPrefixAndSuffix(int rectLeft, boolean isRtl) {
-    if (!isRtl && getPrefixText() != null) {
-      return rectLeft + startLayout.getPrefixTextStartOffset();
+  private int getLabelLeftBoundAlightWithPrefix(int rectLeft, boolean isRtl) {
+    int left = rectLeft + editText.getCompoundPaddingLeft();
+    if (getPrefixText() != null && !isRtl) {
+      // Label should be vertically aligned with prefix
+      left = left - getPrefixTextView().getMeasuredWidth() + getPrefixTextView().getPaddingLeft();
     }
-    if (isRtl && getSuffixText() != null) {
-      return rectLeft + endLayout.getSuffixTextEndOffset();
-    }
-    return rectLeft + editText.getCompoundPaddingLeft();
+    return left;
   }
 
-  private int getLabelRightBoundAlignedWithPrefixAndSuffix(int rectRight, boolean isRtl) {
-    if (!isRtl && getSuffixText() != null) {
-      return rectRight - endLayout.getSuffixTextEndOffset();
-    }
-    if (isRtl && getPrefixText() != null) {
-      return rectRight - startLayout.getPrefixTextStartOffset();
+  private int getLabelRightBoundAlignedWithSuffix(int rectRight, boolean isRtl) {
+    int right = rectRight - editText.getCompoundPaddingRight();
+    if (getPrefixText() != null && isRtl) {
+      // Label should be vertically aligned with prefix if in RTL
+      right += getPrefixTextView().getMeasuredWidth() - getPrefixTextView().getPaddingRight();
     }
-    return rectRight - editText.getCompoundPaddingRight();
+    return right;
   }
 
   @NonNull
diff --git a/material/java/com/google/android/material/textfield/res/values-af/strings.xml b/material/java/com/google/android/material/textfield/res/values-af/strings.xml
index b2c2b40c2..1dac75907 100644
--- a/material/java/com/google/android/material/textfield/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-am/strings.xml b/material/java/com/google/android/material/textfield/res/values-am/strings.xml
index 2e2079f7d..ac70276b1 100644
--- a/material/java/com/google/android/material/textfield/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ar/strings.xml b/material/java/com/google/android/material/textfield/res/values-ar/strings.xml
index 5bd79f62f..0eb881b14 100644
--- a/material/java/com/google/android/material/textfield/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-as/strings.xml b/material/java/com/google/android/material/textfield/res/values-as/strings.xml
index cc6b7e8f1..fa64976f6 100644
--- a/material/java/com/google/android/material/textfield/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-az/strings.xml b/material/java/com/google/android/material/textfield/res/values-az/strings.xml
index 75fe28c5d..64680541b 100644
--- a/material/java/com/google/android/material/textfield/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/textfield/res/values-b+es+419/strings.xml
index 3f35d8d25..3205b7c87 100644
--- a/material/java/com/google/android/material/textfield/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/textfield/res/values-b+sr+Latn/strings.xml
index bec1853a2..c06539dc8 100644
--- a/material/java/com/google/android/material/textfield/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-be/strings.xml b/material/java/com/google/android/material/textfield/res/values-be/strings.xml
index 055341107..30bbbfb66 100644
--- a/material/java/com/google/android/material/textfield/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-bg/strings.xml b/material/java/com/google/android/material/textfield/res/values-bg/strings.xml
index 7c9b4d6ce..1d987e0db 100644
--- a/material/java/com/google/android/material/textfield/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-bn/strings.xml b/material/java/com/google/android/material/textfield/res/values-bn/strings.xml
index 5f91aeaf3..858720407 100644
--- a/material/java/com/google/android/material/textfield/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-bs/strings.xml b/material/java/com/google/android/material/textfield/res/values-bs/strings.xml
index 22c6a1970..2bdf0c566 100644
--- a/material/java/com/google/android/material/textfield/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ca/strings.xml b/material/java/com/google/android/material/textfield/res/values-ca/strings.xml
index 6cde41529..f347d35ab 100644
--- a/material/java/com/google/android/material/textfield/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-cs/strings.xml b/material/java/com/google/android/material/textfield/res/values-cs/strings.xml
index c6991f14c..c2a938130 100644
--- a/material/java/com/google/android/material/textfield/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-da/strings.xml b/material/java/com/google/android/material/textfield/res/values-da/strings.xml
index d14c2f76b..23599e411 100644
--- a/material/java/com/google/android/material/textfield/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-de/strings.xml b/material/java/com/google/android/material/textfield/res/values-de/strings.xml
index 9e15fd7d8..e342b45ca 100644
--- a/material/java/com/google/android/material/textfield/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-el/strings.xml b/material/java/com/google/android/material/textfield/res/values-el/strings.xml
index f1096dd0c..43df15313 100644
--- a/material/java/com/google/android/material/textfield/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/textfield/res/values-en-rGB/strings.xml
index e71ad3046..b7ee07aa5 100644
--- a/material/java/com/google/android/material/textfield/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/textfield/res/values-es-rUS/strings.xml
index 3f35d8d25..3205b7c87 100644
--- a/material/java/com/google/android/material/textfield/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-es/strings.xml b/material/java/com/google/android/material/textfield/res/values-es/strings.xml
index 62c03ca49..76f24a0b4 100644
--- a/material/java/com/google/android/material/textfield/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-et/strings.xml b/material/java/com/google/android/material/textfield/res/values-et/strings.xml
index 0c6250ab6..e0c021b33 100644
--- a/material/java/com/google/android/material/textfield/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-eu/strings.xml b/material/java/com/google/android/material/textfield/res/values-eu/strings.xml
index b934f5d36..54e121923 100644
--- a/material/java/com/google/android/material/textfield/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-fa/strings.xml b/material/java/com/google/android/material/textfield/res/values-fa/strings.xml
index 0aa23579b..e13b1fc4a 100644
--- a/material/java/com/google/android/material/textfield/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-fi/strings.xml b/material/java/com/google/android/material/textfield/res/values-fi/strings.xml
index d5b052c65..ad035e3bc 100644
--- a/material/java/com/google/android/material/textfield/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/textfield/res/values-fr-rCA/strings.xml
index 575789fde..a6b784dea 100644
--- a/material/java/com/google/android/material/textfield/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-fr/strings.xml b/material/java/com/google/android/material/textfield/res/values-fr/strings.xml
index 5f35197cc..dd97224b2 100644
--- a/material/java/com/google/android/material/textfield/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-gl/strings.xml b/material/java/com/google/android/material/textfield/res/values-gl/strings.xml
index cfbdeec67..81f006ade 100644
--- a/material/java/com/google/android/material/textfield/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-gu/strings.xml b/material/java/com/google/android/material/textfield/res/values-gu/strings.xml
index 2fe1e2bea..568a7c4f8 100644
--- a/material/java/com/google/android/material/textfield/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-hi/strings.xml b/material/java/com/google/android/material/textfield/res/values-hi/strings.xml
index 4fa62d654..965a8229d 100644
--- a/material/java/com/google/android/material/textfield/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-hr/strings.xml b/material/java/com/google/android/material/textfield/res/values-hr/strings.xml
index 5d7e45742..ff336f5c8 100644
--- a/material/java/com/google/android/material/textfield/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-hu/strings.xml b/material/java/com/google/android/material/textfield/res/values-hu/strings.xml
index aa5abd0ad..1a69a40fb 100644
--- a/material/java/com/google/android/material/textfield/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-hy/strings.xml b/material/java/com/google/android/material/textfield/res/values-hy/strings.xml
index 69a79e729..c06a500ac 100644
--- a/material/java/com/google/android/material/textfield/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-in/strings.xml b/material/java/com/google/android/material/textfield/res/values-in/strings.xml
index 76fd9cb44..fb9e512a3 100644
--- a/material/java/com/google/android/material/textfield/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-is/strings.xml b/material/java/com/google/android/material/textfield/res/values-is/strings.xml
index 02f23e896..31f0fbbc2 100644
--- a/material/java/com/google/android/material/textfield/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-it/strings.xml b/material/java/com/google/android/material/textfield/res/values-it/strings.xml
index 5cfd3103f..cc6363a67 100644
--- a/material/java/com/google/android/material/textfield/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-iw/strings.xml b/material/java/com/google/android/material/textfield/res/values-iw/strings.xml
index 88f297b9d..f8a71a151 100644
--- a/material/java/com/google/android/material/textfield/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ja/strings.xml b/material/java/com/google/android/material/textfield/res/values-ja/strings.xml
index ad90ca82d..67df71c44 100644
--- a/material/java/com/google/android/material/textfield/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ka/strings.xml b/material/java/com/google/android/material/textfield/res/values-ka/strings.xml
index ec0a0195c..c0d69b0fe 100644
--- a/material/java/com/google/android/material/textfield/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-kk/strings.xml b/material/java/com/google/android/material/textfield/res/values-kk/strings.xml
index 20b7c56f9..a2c54366a 100644
--- a/material/java/com/google/android/material/textfield/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-km/strings.xml b/material/java/com/google/android/material/textfield/res/values-km/strings.xml
index 4e3155f23..8e3cf8b95 100644
--- a/material/java/com/google/android/material/textfield/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-kn/strings.xml b/material/java/com/google/android/material/textfield/res/values-kn/strings.xml
index 2d13cabe3..df231749b 100644
--- a/material/java/com/google/android/material/textfield/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ko/strings.xml b/material/java/com/google/android/material/textfield/res/values-ko/strings.xml
index 8d87f37af..42dec24b7 100644
--- a/material/java/com/google/android/material/textfield/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ky/strings.xml b/material/java/com/google/android/material/textfield/res/values-ky/strings.xml
index b3a7f3fda..1f6d1e423 100644
--- a/material/java/com/google/android/material/textfield/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-lo/strings.xml b/material/java/com/google/android/material/textfield/res/values-lo/strings.xml
index c83478582..918922ced 100644
--- a/material/java/com/google/android/material/textfield/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-lt/strings.xml b/material/java/com/google/android/material/textfield/res/values-lt/strings.xml
index 23d38ebc1..6fd6c5060 100644
--- a/material/java/com/google/android/material/textfield/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-lv/strings.xml b/material/java/com/google/android/material/textfield/res/values-lv/strings.xml
index ff7c6322e..1d657df32 100644
--- a/material/java/com/google/android/material/textfield/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-mk/strings.xml b/material/java/com/google/android/material/textfield/res/values-mk/strings.xml
index d17d25fec..a9c02c6fe 100644
--- a/material/java/com/google/android/material/textfield/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ml/strings.xml b/material/java/com/google/android/material/textfield/res/values-ml/strings.xml
index 086b4b692..dd21054cf 100644
--- a/material/java/com/google/android/material/textfield/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-mn/strings.xml b/material/java/com/google/android/material/textfield/res/values-mn/strings.xml
index cff03522e..9d339dab5 100644
--- a/material/java/com/google/android/material/textfield/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-mr/strings.xml b/material/java/com/google/android/material/textfield/res/values-mr/strings.xml
index d160156c0..454a3ddac 100644
--- a/material/java/com/google/android/material/textfield/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ms/strings.xml b/material/java/com/google/android/material/textfield/res/values-ms/strings.xml
index 4bf1baf99..756fae378 100644
--- a/material/java/com/google/android/material/textfield/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-my/strings.xml b/material/java/com/google/android/material/textfield/res/values-my/strings.xml
index f0199b6cc..14543e429 100644
--- a/material/java/com/google/android/material/textfield/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-nb/strings.xml b/material/java/com/google/android/material/textfield/res/values-nb/strings.xml
index da527a4de..372b2b0b1 100644
--- a/material/java/com/google/android/material/textfield/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ne/strings.xml b/material/java/com/google/android/material/textfield/res/values-ne/strings.xml
index 84ca74b3d..e1bb9a366 100644
--- a/material/java/com/google/android/material/textfield/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-nl/strings.xml b/material/java/com/google/android/material/textfield/res/values-nl/strings.xml
index 5d3c05ebd..4a6844540 100644
--- a/material/java/com/google/android/material/textfield/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-or/strings.xml b/material/java/com/google/android/material/textfield/res/values-or/strings.xml
index 19c91cfa5..4930c8e1b 100644
--- a/material/java/com/google/android/material/textfield/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-pa/strings.xml b/material/java/com/google/android/material/textfield/res/values-pa/strings.xml
index 374d928e5..497200b8b 100644
--- a/material/java/com/google/android/material/textfield/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-pl/strings.xml b/material/java/com/google/android/material/textfield/res/values-pl/strings.xml
index 98a025610..92e0cb6d8 100644
--- a/material/java/com/google/android/material/textfield/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/textfield/res/values-pt-rBR/strings.xml
index e6853f8b7..6406f474c 100644
--- a/material/java/com/google/android/material/textfield/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/textfield/res/values-pt-rPT/strings.xml
index e0463f3d6..da489e2d6 100644
--- a/material/java/com/google/android/material/textfield/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ro/strings.xml b/material/java/com/google/android/material/textfield/res/values-ro/strings.xml
index 717a5b86f..69c0f6cc4 100644
--- a/material/java/com/google/android/material/textfield/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ru/strings.xml b/material/java/com/google/android/material/textfield/res/values-ru/strings.xml
index 6fee22cdb..37409da39 100644
--- a/material/java/com/google/android/material/textfield/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-si/strings.xml b/material/java/com/google/android/material/textfield/res/values-si/strings.xml
index a8c636996..de9eda194 100644
--- a/material/java/com/google/android/material/textfield/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-sk/strings.xml b/material/java/com/google/android/material/textfield/res/values-sk/strings.xml
index 81e872785..92dc7c829 100644
--- a/material/java/com/google/android/material/textfield/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-sl/strings.xml b/material/java/com/google/android/material/textfield/res/values-sl/strings.xml
index 649e9947e..0aa0b72c8 100644
--- a/material/java/com/google/android/material/textfield/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-sq/strings.xml b/material/java/com/google/android/material/textfield/res/values-sq/strings.xml
index 41d6e8e7c..d00530824 100644
--- a/material/java/com/google/android/material/textfield/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-sr/strings.xml b/material/java/com/google/android/material/textfield/res/values-sr/strings.xml
index dfebc1c26..5e1848ee9 100644
--- a/material/java/com/google/android/material/textfield/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-sv/strings.xml b/material/java/com/google/android/material/textfield/res/values-sv/strings.xml
index 39c741a1d..ccc6ba3be 100644
--- a/material/java/com/google/android/material/textfield/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-sw/strings.xml b/material/java/com/google/android/material/textfield/res/values-sw/strings.xml
index d70f1c718..163806144 100644
--- a/material/java/com/google/android/material/textfield/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ta/strings.xml b/material/java/com/google/android/material/textfield/res/values-ta/strings.xml
index 6509a1fae..bbb414bcb 100644
--- a/material/java/com/google/android/material/textfield/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-te/strings.xml b/material/java/com/google/android/material/textfield/res/values-te/strings.xml
index a01a18c4b..b4bf78377 100644
--- a/material/java/com/google/android/material/textfield/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-th/strings.xml b/material/java/com/google/android/material/textfield/res/values-th/strings.xml
index 880aae9e8..06ad9f9a5 100644
--- a/material/java/com/google/android/material/textfield/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-tl/strings.xml b/material/java/com/google/android/material/textfield/res/values-tl/strings.xml
index b8a872e80..777c9eb75 100644
--- a/material/java/com/google/android/material/textfield/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-tr/strings.xml b/material/java/com/google/android/material/textfield/res/values-tr/strings.xml
index 33be65ad1..4f30fa932 100644
--- a/material/java/com/google/android/material/textfield/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-uk/strings.xml b/material/java/com/google/android/material/textfield/res/values-uk/strings.xml
index 15c391920..d1bda70da 100644
--- a/material/java/com/google/android/material/textfield/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-ur/strings.xml b/material/java/com/google/android/material/textfield/res/values-ur/strings.xml
index 54906b8e8..2bddd3bc3 100644
--- a/material/java/com/google/android/material/textfield/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-uz/strings.xml b/material/java/com/google/android/material/textfield/res/values-uz/strings.xml
index 6f779b2c2..05efbf5f3 100644
--- a/material/java/com/google/android/material/textfield/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-vi/strings.xml b/material/java/com/google/android/material/textfield/res/values-vi/strings.xml
index 7f995ba7e..3547cd606 100644
--- a/material/java/com/google/android/material/textfield/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/textfield/res/values-zh-rCN/strings.xml
index 1598f72b5..c8d008ac7 100644
--- a/material/java/com/google/android/material/textfield/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/textfield/res/values-zh-rHK/strings.xml
index d83f47236..73239acfe 100644
--- a/material/java/com/google/android/material/textfield/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/textfield/res/values-zh-rTW/strings.xml
index cd99d9b33..fe879a309 100644
--- a/material/java/com/google/android/material/textfield/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/textfield/res/values-zu/strings.xml b/material/java/com/google/android/material/textfield/res/values-zu/strings.xml
index c6a69187f..7601dbdef 100644
--- a/material/java/com/google/android/material/textfield/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/textfield/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/ChipTextInputComboView.java b/material/java/com/google/android/material/timepicker/ChipTextInputComboView.java
index 883cf3e4e..b3add4ae3 100644
--- a/material/java/com/google/android/material/timepicker/ChipTextInputComboView.java
+++ b/material/java/com/google/android/material/timepicker/ChipTextInputComboView.java
@@ -108,7 +108,7 @@ public void setChecked(boolean checked) {
     // Instead, the text in chip should be hidden.
     chip.setVisibility(checked ? GONE : VISIBLE);
     if (isChecked()) {
-      ViewUtils.requestFocusAndShowKeyboard(editText, /* useWindowInsetsController= */ false);
+      ViewUtils.requestFocusAndShowKeyboard(editText);
     }
   }
 
diff --git a/material/java/com/google/android/material/timepicker/res/values-af/strings.xml b/material/java/com/google/android/material/timepicker/res/values-af/strings.xml
index c0fea08a5..d8285df2b 100644
--- a/material/java/com/google/android/material/timepicker/res/values-af/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-af/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-am/strings.xml b/material/java/com/google/android/material/timepicker/res/values-am/strings.xml
index 3e2e09aeb..a5ab7b733 100644
--- a/material/java/com/google/android/material/timepicker/res/values-am/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-am/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ar/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ar/strings.xml
index 0d1ae78dd..0da5150b6 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ar/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ar/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-as/strings.xml b/material/java/com/google/android/material/timepicker/res/values-as/strings.xml
index 6c3b9db8a..30e465c77 100644
--- a/material/java/com/google/android/material/timepicker/res/values-as/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-as/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-az/strings.xml b/material/java/com/google/android/material/timepicker/res/values-az/strings.xml
index f47fac47c..df1a988c2 100644
--- a/material/java/com/google/android/material/timepicker/res/values-az/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-az/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-b+es+419/strings.xml b/material/java/com/google/android/material/timepicker/res/values-b+es+419/strings.xml
index 0e2d13451..cd217976c 100644
--- a/material/java/com/google/android/material/timepicker/res/values-b+es+419/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-b+es+419/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-b+sr+Latn/strings.xml b/material/java/com/google/android/material/timepicker/res/values-b+sr+Latn/strings.xml
index 7254072e0..77ff4c51d 100644
--- a/material/java/com/google/android/material/timepicker/res/values-b+sr+Latn/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-b+sr+Latn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-be/strings.xml b/material/java/com/google/android/material/timepicker/res/values-be/strings.xml
index 30d8eada0..b0f6ba3dd 100644
--- a/material/java/com/google/android/material/timepicker/res/values-be/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-be/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-bg/strings.xml b/material/java/com/google/android/material/timepicker/res/values-bg/strings.xml
index a5a6e8def..5bbf9f89f 100644
--- a/material/java/com/google/android/material/timepicker/res/values-bg/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-bg/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-bn/strings.xml b/material/java/com/google/android/material/timepicker/res/values-bn/strings.xml
index 492e2cb59..14b1bf450 100644
--- a/material/java/com/google/android/material/timepicker/res/values-bn/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-bn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-bs/strings.xml b/material/java/com/google/android/material/timepicker/res/values-bs/strings.xml
index 42f16db76..9438ee03a 100644
--- a/material/java/com/google/android/material/timepicker/res/values-bs/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-bs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ca/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ca/strings.xml
index 5d4edbcf3..1e90de262 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ca/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ca/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-cs/strings.xml b/material/java/com/google/android/material/timepicker/res/values-cs/strings.xml
index d0a644afd..a0058913c 100644
--- a/material/java/com/google/android/material/timepicker/res/values-cs/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-cs/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-da/strings.xml b/material/java/com/google/android/material/timepicker/res/values-da/strings.xml
index ea00d16f5..97065c793 100644
--- a/material/java/com/google/android/material/timepicker/res/values-da/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-da/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-de/strings.xml b/material/java/com/google/android/material/timepicker/res/values-de/strings.xml
index 711e7e2e5..33932ca19 100644
--- a/material/java/com/google/android/material/timepicker/res/values-de/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-de/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-el/strings.xml b/material/java/com/google/android/material/timepicker/res/values-el/strings.xml
index a7e40a879..29a4123d7 100644
--- a/material/java/com/google/android/material/timepicker/res/values-el/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-el/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-en-rGB/strings.xml b/material/java/com/google/android/material/timepicker/res/values-en-rGB/strings.xml
index 73b9861bc..646d62d1a 100644
--- a/material/java/com/google/android/material/timepicker/res/values-en-rGB/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-en-rGB/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-es-rUS/strings.xml b/material/java/com/google/android/material/timepicker/res/values-es-rUS/strings.xml
index 0e2d13451..cd217976c 100644
--- a/material/java/com/google/android/material/timepicker/res/values-es-rUS/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-es-rUS/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-es/strings.xml b/material/java/com/google/android/material/timepicker/res/values-es/strings.xml
index 4c3b024c9..854022c80 100644
--- a/material/java/com/google/android/material/timepicker/res/values-es/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-es/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-et/strings.xml b/material/java/com/google/android/material/timepicker/res/values-et/strings.xml
index 0b7ae3ec1..06d29a102 100644
--- a/material/java/com/google/android/material/timepicker/res/values-et/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-et/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-eu/strings.xml b/material/java/com/google/android/material/timepicker/res/values-eu/strings.xml
index 14c2ea17c..4eba3902e 100644
--- a/material/java/com/google/android/material/timepicker/res/values-eu/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-eu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-fa/strings.xml b/material/java/com/google/android/material/timepicker/res/values-fa/strings.xml
index 2c0163b6f..48dadb731 100644
--- a/material/java/com/google/android/material/timepicker/res/values-fa/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-fa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-fi/strings.xml b/material/java/com/google/android/material/timepicker/res/values-fi/strings.xml
index 8274d1b82..c283a0f8f 100644
--- a/material/java/com/google/android/material/timepicker/res/values-fi/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-fi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-fr-rCA/strings.xml b/material/java/com/google/android/material/timepicker/res/values-fr-rCA/strings.xml
index ec5442a19..26f9357f2 100644
--- a/material/java/com/google/android/material/timepicker/res/values-fr-rCA/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-fr-rCA/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-fr/strings.xml b/material/java/com/google/android/material/timepicker/res/values-fr/strings.xml
index 64fe1084f..0deb406d4 100644
--- a/material/java/com/google/android/material/timepicker/res/values-fr/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-fr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-gl/strings.xml b/material/java/com/google/android/material/timepicker/res/values-gl/strings.xml
index 1a38ee612..753e7cdce 100644
--- a/material/java/com/google/android/material/timepicker/res/values-gl/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-gl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-gu/strings.xml b/material/java/com/google/android/material/timepicker/res/values-gu/strings.xml
index 2ceb05cd1..910dee2f6 100644
--- a/material/java/com/google/android/material/timepicker/res/values-gu/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-gu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-hi/strings.xml b/material/java/com/google/android/material/timepicker/res/values-hi/strings.xml
index 15a0facfd..23d8c67ba 100644
--- a/material/java/com/google/android/material/timepicker/res/values-hi/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-hi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-hr/strings.xml b/material/java/com/google/android/material/timepicker/res/values-hr/strings.xml
index 964dd224c..3060f9b8e 100644
--- a/material/java/com/google/android/material/timepicker/res/values-hr/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-hr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-hu/strings.xml b/material/java/com/google/android/material/timepicker/res/values-hu/strings.xml
index b1741e071..8715a1885 100644
--- a/material/java/com/google/android/material/timepicker/res/values-hu/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-hu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-hy/strings.xml b/material/java/com/google/android/material/timepicker/res/values-hy/strings.xml
index a15c3450a..7c5b404fd 100644
--- a/material/java/com/google/android/material/timepicker/res/values-hy/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-hy/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-in/strings.xml b/material/java/com/google/android/material/timepicker/res/values-in/strings.xml
index 0eb7ee614..42ff1ca7b 100644
--- a/material/java/com/google/android/material/timepicker/res/values-in/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-in/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-is/strings.xml b/material/java/com/google/android/material/timepicker/res/values-is/strings.xml
index c56e37d6e..aeca122b1 100644
--- a/material/java/com/google/android/material/timepicker/res/values-is/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-is/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-it/strings.xml b/material/java/com/google/android/material/timepicker/res/values-it/strings.xml
index 485e21172..2d231e238 100644
--- a/material/java/com/google/android/material/timepicker/res/values-it/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-it/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-iw/strings.xml b/material/java/com/google/android/material/timepicker/res/values-iw/strings.xml
index e8b0aacbd..1341433c9 100644
--- a/material/java/com/google/android/material/timepicker/res/values-iw/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-iw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ja/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ja/strings.xml
index 4843d0663..e97ad5a8a 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ja/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ja/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ka/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ka/strings.xml
index d03d4880b..9a21a866f 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ka/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ka/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-kk/strings.xml b/material/java/com/google/android/material/timepicker/res/values-kk/strings.xml
index b73f43bc8..324972079 100644
--- a/material/java/com/google/android/material/timepicker/res/values-kk/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-kk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-km/strings.xml b/material/java/com/google/android/material/timepicker/res/values-km/strings.xml
index a6ebbcb11..68e2f32ac 100644
--- a/material/java/com/google/android/material/timepicker/res/values-km/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-km/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-kn/strings.xml b/material/java/com/google/android/material/timepicker/res/values-kn/strings.xml
index 22c1c323a..f6d9e6fb7 100644
--- a/material/java/com/google/android/material/timepicker/res/values-kn/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-kn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ko/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ko/strings.xml
index 8ee51b44a..bfac9ed1f 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ko/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ko/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ky/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ky/strings.xml
index a353409a9..e3b9bc4d4 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ky/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ky/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-lo/strings.xml b/material/java/com/google/android/material/timepicker/res/values-lo/strings.xml
index c746566e5..2ee6f30bf 100644
--- a/material/java/com/google/android/material/timepicker/res/values-lo/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-lo/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-lt/strings.xml b/material/java/com/google/android/material/timepicker/res/values-lt/strings.xml
index e91c03204..1f478c59c 100644
--- a/material/java/com/google/android/material/timepicker/res/values-lt/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-lt/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-lv/strings.xml b/material/java/com/google/android/material/timepicker/res/values-lv/strings.xml
index 2096994a6..4f7fdeedb 100644
--- a/material/java/com/google/android/material/timepicker/res/values-lv/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-lv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-mk/strings.xml b/material/java/com/google/android/material/timepicker/res/values-mk/strings.xml
index f03ec6f39..8f8b6eb68 100644
--- a/material/java/com/google/android/material/timepicker/res/values-mk/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-mk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ml/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ml/strings.xml
index fff124cd4..3723227df 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ml/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ml/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-mn/strings.xml b/material/java/com/google/android/material/timepicker/res/values-mn/strings.xml
index 03f66f211..b2b17036c 100644
--- a/material/java/com/google/android/material/timepicker/res/values-mn/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-mn/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-mr/strings.xml b/material/java/com/google/android/material/timepicker/res/values-mr/strings.xml
index aeb515c27..ae5166c83 100644
--- a/material/java/com/google/android/material/timepicker/res/values-mr/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-mr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ms/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ms/strings.xml
index 9220222c5..2d5bf64fb 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ms/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ms/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-my/strings.xml b/material/java/com/google/android/material/timepicker/res/values-my/strings.xml
index 8221fb9dc..983f1dd4d 100644
--- a/material/java/com/google/android/material/timepicker/res/values-my/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-my/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-nb/strings.xml b/material/java/com/google/android/material/timepicker/res/values-nb/strings.xml
index 99978a39b..934dd0c1c 100644
--- a/material/java/com/google/android/material/timepicker/res/values-nb/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-nb/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ne/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ne/strings.xml
index 77bd87187..b8bf415c8 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ne/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ne/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-nl/strings.xml b/material/java/com/google/android/material/timepicker/res/values-nl/strings.xml
index 014f2791c..0e2de4148 100644
--- a/material/java/com/google/android/material/timepicker/res/values-nl/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-nl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-or/strings.xml b/material/java/com/google/android/material/timepicker/res/values-or/strings.xml
index 045222ab0..58520b9dc 100644
--- a/material/java/com/google/android/material/timepicker/res/values-or/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-or/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-pa/strings.xml b/material/java/com/google/android/material/timepicker/res/values-pa/strings.xml
index a454033f4..db2c3cdd3 100644
--- a/material/java/com/google/android/material/timepicker/res/values-pa/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-pa/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-pl/strings.xml b/material/java/com/google/android/material/timepicker/res/values-pl/strings.xml
index 707683f0c..ae706b331 100644
--- a/material/java/com/google/android/material/timepicker/res/values-pl/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-pl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-pt-rBR/strings.xml b/material/java/com/google/android/material/timepicker/res/values-pt-rBR/strings.xml
index af27d0cff..2b1e46396 100644
--- a/material/java/com/google/android/material/timepicker/res/values-pt-rBR/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-pt-rBR/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-pt-rPT/strings.xml b/material/java/com/google/android/material/timepicker/res/values-pt-rPT/strings.xml
index c5002cb0d..9553d0ab3 100644
--- a/material/java/com/google/android/material/timepicker/res/values-pt-rPT/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-pt-rPT/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ro/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ro/strings.xml
index 481da050c..57223f03e 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ro/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ro/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ru/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ru/strings.xml
index 0c9704ee3..511f7a660 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ru/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ru/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-si/strings.xml b/material/java/com/google/android/material/timepicker/res/values-si/strings.xml
index 7e2ccd7e2..d75427f06 100644
--- a/material/java/com/google/android/material/timepicker/res/values-si/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-si/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-sk/strings.xml b/material/java/com/google/android/material/timepicker/res/values-sk/strings.xml
index d0dff04f0..da3604d6d 100644
--- a/material/java/com/google/android/material/timepicker/res/values-sk/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-sk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-sl/strings.xml b/material/java/com/google/android/material/timepicker/res/values-sl/strings.xml
index 7e5e7f102..f9e22be13 100644
--- a/material/java/com/google/android/material/timepicker/res/values-sl/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-sl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-sq/strings.xml b/material/java/com/google/android/material/timepicker/res/values-sq/strings.xml
index ea12683a8..84ba9c153 100644
--- a/material/java/com/google/android/material/timepicker/res/values-sq/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-sq/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-sr/strings.xml b/material/java/com/google/android/material/timepicker/res/values-sr/strings.xml
index 07180197c..aa63c611a 100644
--- a/material/java/com/google/android/material/timepicker/res/values-sr/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-sr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-sv/strings.xml b/material/java/com/google/android/material/timepicker/res/values-sv/strings.xml
index e631b3b4d..dd8f8939f 100644
--- a/material/java/com/google/android/material/timepicker/res/values-sv/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-sv/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-sw/strings.xml b/material/java/com/google/android/material/timepicker/res/values-sw/strings.xml
index 9b6aef8b3..c119bc37b 100644
--- a/material/java/com/google/android/material/timepicker/res/values-sw/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ta/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ta/strings.xml
index 1cda874b6..b6451fedb 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ta/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ta/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-te/strings.xml b/material/java/com/google/android/material/timepicker/res/values-te/strings.xml
index 2f1adcf42..55de86ea0 100644
--- a/material/java/com/google/android/material/timepicker/res/values-te/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-te/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-th/strings.xml b/material/java/com/google/android/material/timepicker/res/values-th/strings.xml
index 863bd414c..a1305eacd 100644
--- a/material/java/com/google/android/material/timepicker/res/values-th/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-th/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-tl/strings.xml b/material/java/com/google/android/material/timepicker/res/values-tl/strings.xml
index 53ab6b143..7b36bc6d8 100644
--- a/material/java/com/google/android/material/timepicker/res/values-tl/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-tl/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-tr/strings.xml b/material/java/com/google/android/material/timepicker/res/values-tr/strings.xml
index 4876c15d8..e9e4d071e 100644
--- a/material/java/com/google/android/material/timepicker/res/values-tr/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-tr/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-uk/strings.xml b/material/java/com/google/android/material/timepicker/res/values-uk/strings.xml
index c8a793cf5..21bbc7c15 100644
--- a/material/java/com/google/android/material/timepicker/res/values-uk/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-uk/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-ur/strings.xml b/material/java/com/google/android/material/timepicker/res/values-ur/strings.xml
index 21c48d5b3..e2328a033 100644
--- a/material/java/com/google/android/material/timepicker/res/values-ur/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-ur/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-uz/strings.xml b/material/java/com/google/android/material/timepicker/res/values-uz/strings.xml
index b45b7da41..849a1dcfc 100644
--- a/material/java/com/google/android/material/timepicker/res/values-uz/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-uz/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-vi/strings.xml b/material/java/com/google/android/material/timepicker/res/values-vi/strings.xml
index 8a968323d..b9dca1e26 100644
--- a/material/java/com/google/android/material/timepicker/res/values-vi/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-vi/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-zh-rCN/strings.xml b/material/java/com/google/android/material/timepicker/res/values-zh-rCN/strings.xml
index 623be7019..92fd964b0 100644
--- a/material/java/com/google/android/material/timepicker/res/values-zh-rCN/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-zh-rCN/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-zh-rHK/strings.xml b/material/java/com/google/android/material/timepicker/res/values-zh-rHK/strings.xml
index 0a594a093..feda2ab3e 100644
--- a/material/java/com/google/android/material/timepicker/res/values-zh-rHK/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-zh-rHK/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-zh-rTW/strings.xml b/material/java/com/google/android/material/timepicker/res/values-zh-rTW/strings.xml
index ab4930fc3..ab2b001bb 100644
--- a/material/java/com/google/android/material/timepicker/res/values-zh-rTW/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-zh-rTW/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/timepicker/res/values-zu/strings.xml b/material/java/com/google/android/material/timepicker/res/values-zu/strings.xml
index ab136e26d..3fb2d54c0 100644
--- a/material/java/com/google/android/material/timepicker/res/values-zu/strings.xml
+++ b/material/java/com/google/android/material/timepicker/res/values-zu/strings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (C) 2023 The Android Open Source Project
+  ~ Copyright (C) 2022 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
diff --git a/material/java/com/google/android/material/transition/MaterialContainerTransform.java b/material/java/com/google/android/material/transition/MaterialContainerTransform.java
index baf1ac88f..e6105ec82 100644
--- a/material/java/com/google/android/material/transition/MaterialContainerTransform.java
+++ b/material/java/com/google/android/material/transition/MaterialContainerTransform.java
@@ -70,11 +70,11 @@
 import androidx.transition.Transition;
 import androidx.transition.TransitionValues;
 import com.google.android.material.animation.AnimationUtils;
+import com.google.android.material.canvas.CanvasCompat.CanvasOperation;
 import com.google.android.material.internal.ViewUtils;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.ShapeAppearanceModel;
 import com.google.android.material.shape.Shapeable;
-import com.google.android.material.transition.TransitionUtils.CanvasOperation;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
diff --git a/material/java/com/google/android/material/transition/TransitionUtils.java b/material/java/com/google/android/material/transition/TransitionUtils.java
index ac3823970..1ba6f6b5e 100644
--- a/material/java/com/google/android/material/transition/TransitionUtils.java
+++ b/material/java/com/google/android/material/transition/TransitionUtils.java
@@ -39,6 +39,7 @@
 import androidx.transition.PatternPathMotion;
 import androidx.transition.Transition;
 import androidx.transition.TransitionSet;
+import com.google.android.material.canvas.CanvasCompat.CanvasOperation;
 import com.google.android.material.motion.MotionUtils;
 import com.google.android.material.shape.AbsoluteCornerSize;
 import com.google.android.material.shape.CornerSize;
@@ -351,10 +352,6 @@ static void transform(
     canvas.restoreToCount(checkpoint);
   }
 
-  interface CanvasOperation {
-    void run(Canvas canvas);
-  }
-
   static void maybeAddTransition(TransitionSet transitionSet, @Nullable Transition transition) {
     if (transition != null) {
       transitionSet.addTransition(transition);
diff --git a/material/java/com/google/android/material/transition/platform/MaterialContainerTransform.java b/material/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
index 0f1161a3f..fd3c14c7b 100644
--- a/material/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
+++ b/material/java/com/google/android/material/transition/platform/MaterialContainerTransform.java
@@ -74,11 +74,11 @@
 import android.transition.Transition;
 import android.transition.TransitionValues;
 import com.google.android.material.animation.AnimationUtils;
+import com.google.android.material.canvas.CanvasCompat.CanvasOperation;
 import com.google.android.material.internal.ViewUtils;
 import com.google.android.material.shape.MaterialShapeDrawable;
 import com.google.android.material.shape.ShapeAppearanceModel;
 import com.google.android.material.shape.Shapeable;
-import com.google.android.material.transition.platform.TransitionUtils.CanvasOperation;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 
diff --git a/material/java/com/google/android/material/transition/platform/TransitionUtils.java b/material/java/com/google/android/material/transition/platform/TransitionUtils.java
index 22c6f98cb..31c6b586b 100644
--- a/material/java/com/google/android/material/transition/platform/TransitionUtils.java
+++ b/material/java/com/google/android/material/transition/platform/TransitionUtils.java
@@ -43,6 +43,7 @@
 import android.transition.PatternPathMotion;
 import android.transition.Transition;
 import android.transition.TransitionSet;
+import com.google.android.material.canvas.CanvasCompat.CanvasOperation;
 import com.google.android.material.motion.MotionUtils;
 import com.google.android.material.shape.AbsoluteCornerSize;
 import com.google.android.material.shape.CornerSize;
@@ -356,10 +357,6 @@ static void transform(
     canvas.restoreToCount(checkpoint);
   }
 
-  interface CanvasOperation {
-    void run(Canvas canvas);
-  }
-
   static void maybeAddTransition(TransitionSet transitionSet, @Nullable Transition transition) {
     if (transition != null) {
       transitionSet.addTransition(transition);
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/Dispatcher.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/Dispatcher.kt
index 17117cad8..724676c14 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/Dispatcher.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/Dispatcher.kt
@@ -46,7 +46,7 @@ import com.squareup.picasso3.Utils.flushStackLocalLeaks
 import com.squareup.picasso3.Utils.getLogIdsForHunter
 import com.squareup.picasso3.Utils.hasPermission
 import com.squareup.picasso3.Utils.log
-import java.util.*
+import java.util.WeakHashMap
 import java.util.concurrent.ExecutorService
 
 internal class Dispatcher internal constructor(
diff --git a/picasso3/src/main/kotlin/com/squareup/picasso3/Picasso.kt b/picasso3/src/main/kotlin/com/squareup/picasso3/Picasso.kt
index 90b7e1ea0..c562f0be2 100644
--- a/picasso3/src/main/kotlin/com/squareup/picasso3/Picasso.kt
+++ b/picasso3/src/main/kotlin/com/squareup/picasso3/Picasso.kt
@@ -49,7 +49,7 @@ import okhttp3.Cache
 import okhttp3.OkHttpClient
 import java.io.File
 import java.io.IOException
-import java.util.*
+import java.util.WeakHashMap
 import java.util.concurrent.ExecutorService
 
 /**
diff --git a/viewpager2/src/main/kotlin/androidx/recyclerview/widget/LinearLayoutManager_SavedState.kt b/viewpager2/src/main/kotlin/androidx/recyclerview/widget/LinearLayoutManager_SavedState.kt
index 6964b6b1a..f0902144a 100644
--- a/viewpager2/src/main/kotlin/androidx/recyclerview/widget/LinearLayoutManager_SavedState.kt
+++ b/viewpager2/src/main/kotlin/androidx/recyclerview/widget/LinearLayoutManager_SavedState.kt
@@ -18,7 +18,6 @@ class LinearLayoutManager_SavedState : Parcelable {
     @JvmField
     var mAnchorLayoutFromEnd = false
 
-    @Suppress("unused")
     constructor()
     internal constructor(parcel: Parcel) {
         mAnchorPosition = parcel.readInt()
diff --git a/viewpager2/src/main/kotlin/androidx/recyclerview/widget/StaggeredGridLayoutManager_SavedState.kt b/viewpager2/src/main/kotlin/androidx/recyclerview/widget/StaggeredGridLayoutManager_SavedState.kt
index 0ba8e968c..8cf1fcb17 100644
--- a/viewpager2/src/main/kotlin/androidx/recyclerview/widget/StaggeredGridLayoutManager_SavedState.kt
+++ b/viewpager2/src/main/kotlin/androidx/recyclerview/widget/StaggeredGridLayoutManager_SavedState.kt
@@ -3,7 +3,7 @@ package androidx.recyclerview.widget
 import android.os.Parcel
 import android.os.Parcelable
 import kotlinx.serialization.Serializable
-import java.util.*
+import java.util.Arrays
 
 /**
  * @hide
@@ -157,7 +157,6 @@ class FullSpanItem : Parcelable {
         }
     }
 
-    @Suppress("unused")
     constructor()
 
     fun getGapForSpan(spanIndex: Int): Int {
diff --git a/viewpager2/src/main/res/values/attrs.xml b/viewpager2/src/main/res/values/attrs.xml
index 0c81f47b6..1a6c5a486 100644
--- a/viewpager2/src/main/res/values/attrs.xml
+++ b/viewpager2/src/main/res/values/attrs.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2015 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -38,7 +37,7 @@
         <attr name="android:orientation" />
         <attr name="android:descendantFocusability" />
         <attr name="android:clipToPadding" />
-        <attr name="spanCount" format="integer"/>
+        <attr name="spanCount" format="integer" />
         <attr name="reverseLayout" format="boolean" />
         <attr name="stackFromEnd" format="boolean" />
         <attr name="fastScrollEnabled" format="boolean" />
diff --git a/viewpager2/src/main/res/values/dimens.xml b/viewpager2/src/main/res/values/dimens.xml
index bd5cdb4bc..5ea5ebd12 100644
--- a/viewpager2/src/main/res/values/dimens.xml
+++ b/viewpager2/src/main/res/values/dimens.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Copyright (C) 2015 The Android Open Source Project
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
diff --git a/viewpager2/src/main/res/values/ids.xml b/viewpager2/src/main/res/values/ids.xml
index 4ed0ecd89..07a2a77a3 100644
--- a/viewpager2/src/main/res/values/ids.xml
+++ b/viewpager2/src/main/res/values/ids.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 The Android Open Source Project
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2015 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -15,5 +14,5 @@
 -->
 <resources>
     <!-- ItemTouchHelper uses this id to save a View's original elevation. -->
-    <item type="id" name="item_touch_helper_previous_elevation"/>
+    <item name="item_touch_helper_previous_elevation" type="id" />
 </resources>
\ No newline at end of file