From 9d86d273880325c5f8ca351e4eacafa6ad957d7c Mon Sep 17 00:00:00 2001 From: Material Design Team Date: Sat, 20 Nov 2021 00:39:47 +0000 Subject: [PATCH] Internal change PiperOrigin-RevId: 411170890 --- catalog/build.gradle | 4 ++-- .../adaptive/AdaptiveFeedDemoActivity.java | 18 ++++++++--------- .../AdaptiveListViewDemoActivity.java | 18 ++++++++--------- ...daptiveMusicPlayerLibraryDemoFragment.java | 20 +++++++++---------- .../AdaptiveSupportingPanelDemoActivity.java | 18 ++++++++--------- 5 files changed, 39 insertions(+), 39 deletions(-) diff --git a/catalog/build.gradle b/catalog/build.gradle index 8a32c10f9e9..2c47b87d325 100644 --- a/catalog/build.gradle +++ b/catalog/build.gradle @@ -13,8 +13,8 @@ dependencies { api 'androidx.gridlayout:gridlayout:1.0.0' api "androidx.multidex:multidex:2.0.1" api "androidx.recyclerview:recyclerview:1.2.1" - api 'androidx.window:window:1.0.0-beta02' - api "androidx.window:window-java:1.0.0-beta02" + api 'androidx.window:window:1.0.0-beta04' + api "androidx.window:window-java:1.0.0-beta04" api "androidx.preference:preference:1.1.1" api 'com.google.guava:guava:27.0.1-android' diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java b/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java index 325c8eb0135..ce755013109 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java @@ -29,11 +29,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter; +import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; import androidx.window.layout.FoldingFeature; import androidx.window.layout.FoldingFeature.Orientation; -import androidx.window.layout.WindowInfoRepository; +import androidx.window.layout.WindowInfoTracker; import androidx.window.layout.WindowLayoutInfo; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; @@ -55,7 +55,7 @@ public class AdaptiveFeedDemoActivity extends DemoActivity { private ExtendedFloatingActionButton navFab; private AdaptiveFeedDemoFragment feedFragment; - @Nullable private WindowInfoRepositoryCallbackAdapter windowInfoRepo; + @Nullable private WindowInfoTrackerCallbackAdapter windowInfoTracker; private final Consumer stateContainer = new StateContainer(); private final Handler handler = new Handler(Looper.getMainLooper()); private final Executor executor = command -> handler.post(() -> handler.post(command)); @@ -71,8 +71,8 @@ public View onCreateDemoView( container = view.findViewById(R.id.feed_activity_container); drawerLayout = view.findViewById(R.id.drawer_layout); modalNavDrawer = view.findViewById(R.id.modal_nav_drawer); - windowInfoRepo = - new WindowInfoRepositoryCallbackAdapter(WindowInfoRepository.getOrCreate(this)); + windowInfoTracker = + new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this)); configuration = getResources().getConfiguration(); bottomNav = view.findViewById(R.id.bottom_nav); navRail = view.findViewById(R.id.nav_rail); @@ -107,16 +107,16 @@ protected void onCreate(@Nullable Bundle bundle) { @Override public void onStart() { super.onStart(); - if (windowInfoRepo != null) { - windowInfoRepo.addWindowLayoutInfoListener(executor, stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.addWindowLayoutInfoListener(this, executor, stateContainer); } } @Override public void onStop() { super.onStop(); - if (windowInfoRepo != null) { - windowInfoRepo.removeWindowLayoutInfoListener(stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.removeWindowLayoutInfoListener(stateContainer); } } diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java b/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java index f812a6d11e4..9781c92dded 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java @@ -33,11 +33,11 @@ import androidx.constraintlayout.widget.ConstraintSet; import androidx.constraintlayout.widget.ReactiveGuide; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter; +import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; import androidx.window.layout.FoldingFeature; import androidx.window.layout.FoldingFeature.Orientation; -import androidx.window.layout.WindowInfoRepository; +import androidx.window.layout.WindowInfoTracker; import androidx.window.layout.WindowLayoutInfo; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; @@ -61,7 +61,7 @@ public class AdaptiveListViewDemoActivity extends DemoActivity { private NavigationView navDrawer; private ExtendedFloatingActionButton navFab; - @Nullable private WindowInfoRepositoryCallbackAdapter windowInfoRepo; + @Nullable private WindowInfoTrackerCallbackAdapter windowInfoTracker; private final Consumer stateContainer = new StateContainer(); private final Handler handler = new Handler(Looper.getMainLooper()); private final Executor executor = command -> handler.post(() -> handler.post(command)); @@ -79,8 +79,8 @@ public View onCreateDemoView( @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) { View view = layoutInflater.inflate(R.layout.cat_adaptive_list_view_activity, viewGroup, false); - windowInfoRepo = - new WindowInfoRepositoryCallbackAdapter(WindowInfoRepository.getOrCreate(this)); + windowInfoTracker = + new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this)); drawerLayout = view.findViewById(R.id.drawer_layout); constraintLayout = view.findViewById(R.id.list_view_activity_constraint_layout); modalNavDrawer = view.findViewById(R.id.modal_nav_drawer); @@ -141,16 +141,16 @@ private void updateLandscapeLayout(int guidelinePosition, int foldWidth) { @Override public void onStart() { super.onStart(); - if (windowInfoRepo != null) { - windowInfoRepo.addWindowLayoutInfoListener(executor, stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.addWindowLayoutInfoListener(this, executor, stateContainer); } } @Override public void onStop() { super.onStop(); - if (windowInfoRepo != null) { - windowInfoRepo.removeWindowLayoutInfoListener(stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.removeWindowLayoutInfoListener(stateContainer); } } diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java b/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java index 680f31cdbf9..0a47de401d2 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java @@ -28,10 +28,10 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter; +import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; import androidx.window.layout.FoldingFeature; -import androidx.window.layout.WindowInfoRepository; +import androidx.window.layout.WindowInfoTracker; import androidx.window.layout.WindowLayoutInfo; import com.google.android.material.transition.Hold; import com.google.android.material.transition.MaterialContainerTransform; @@ -44,7 +44,7 @@ /** An adaptive Fragment that hosts a toolbar and a child fragment with a list of music data. */ public class AdaptiveMusicPlayerLibraryDemoFragment extends MusicPlayerLibraryDemoFragment { - @Nullable private WindowInfoRepositoryCallbackAdapter windowInfoRepo; + @Nullable private WindowInfoTrackerCallbackAdapter windowInfoTracker; private final Consumer stateContainer = new StateContainer(); private final Handler handler = new Handler(Looper.getMainLooper()); private final Executor executor = command -> handler.post(() -> handler.post(command)); @@ -56,25 +56,25 @@ public View onCreateView( @Nullable ViewGroup viewGroup, @Nullable Bundle bundle) { View view = layoutInflater.inflate(getDemoLayoutResId(), viewGroup, false); - windowInfoRepo = - new WindowInfoRepositoryCallbackAdapter( - WindowInfoRepository.getOrCreate(requireActivity())); + windowInfoTracker = + new WindowInfoTrackerCallbackAdapter( + WindowInfoTracker.getOrCreate(requireActivity())); return view; } @Override public void onStart() { super.onStart(); - if (windowInfoRepo != null) { - windowInfoRepo.addWindowLayoutInfoListener(executor, stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.addWindowLayoutInfoListener(this.getActivity(), executor, stateContainer); } } @Override public void onStop() { super.onStop(); - if (windowInfoRepo != null) { - windowInfoRepo.removeWindowLayoutInfoListener(stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.removeWindowLayoutInfoListener(stateContainer); } } diff --git a/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java b/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java index 3b0d5f2de7c..9030a90502e 100644 --- a/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java +++ b/catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java @@ -29,11 +29,11 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.drawerlayout.widget.DrawerLayout; -import androidx.window.java.layout.WindowInfoRepositoryCallbackAdapter; +import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter; import androidx.window.layout.DisplayFeature; import androidx.window.layout.FoldingFeature; import androidx.window.layout.FoldingFeature.Orientation; -import androidx.window.layout.WindowInfoRepository; +import androidx.window.layout.WindowInfoTracker; import androidx.window.layout.WindowLayoutInfo; import com.google.android.material.bottomnavigation.BottomNavigationView; import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton; @@ -54,7 +54,7 @@ public class AdaptiveSupportingPanelDemoActivity extends DemoActivity { private ExtendedFloatingActionButton navFab; private AdaptiveSupportingPanelDemoFragment demoFragment; - @Nullable private WindowInfoRepositoryCallbackAdapter windowInfoRepo; + @Nullable private WindowInfoTrackerCallbackAdapter windowInfoTracker; private final Consumer stateContainer = new StateContainer(); private final Handler handler = new Handler(Looper.getMainLooper()); private final Executor executor = command -> handler.post(() -> handler.post(command)); @@ -68,8 +68,8 @@ public View onCreateDemoView( @Nullable Bundle bundle) { View view = layoutInflater.inflate(R.layout.cat_adaptive_supporting_panel_activity, viewGroup, false); - windowInfoRepo = - new WindowInfoRepositoryCallbackAdapter(WindowInfoRepository.getOrCreate(this)); + windowInfoTracker = + new WindowInfoTrackerCallbackAdapter(WindowInfoTracker.getOrCreate(this)); drawerLayout = view.findViewById(R.id.drawer_layout); modalNavDrawer = view.findViewById(R.id.modal_nav_drawer); bottomNav = view.findViewById(R.id.bottom_nav); @@ -106,16 +106,16 @@ protected void onCreate(@Nullable Bundle bundle) { @Override public void onStart() { super.onStart(); - if (windowInfoRepo != null) { - windowInfoRepo.addWindowLayoutInfoListener(executor, stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.addWindowLayoutInfoListener(this, executor, stateContainer); } } @Override public void onStop() { super.onStop(); - if (windowInfoRepo != null) { - windowInfoRepo.removeWindowLayoutInfoListener(stateContainer); + if (windowInfoTracker != null) { + windowInfoTracker.removeWindowLayoutInfoListener(stateContainer); } }