summaryrefslogtreecommitdiffstats
path: root/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java')
-rwxr-xr-xsrc/com/android/wallpaper/picker/individual/IndividualPickerFragment.java119
1 files changed, 50 insertions, 69 deletions
diff --git a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
index db21da3..c0c4ce5 100755
--- a/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
+++ b/src/com/android/wallpaper/picker/individual/IndividualPickerFragment.java
@@ -58,13 +58,11 @@ import com.android.wallpaper.model.WallpaperRotationInitializer;
import com.android.wallpaper.model.WallpaperRotationInitializer.Listener;
import com.android.wallpaper.model.WallpaperRotationInitializer.NetworkPreference;
import com.android.wallpaper.model.WallpaperRotationInitializer.RotationInitializationState;
-import com.android.wallpaper.model.WallpaperRotationInitializer.RotationStateListener;
import com.android.wallpaper.module.FormFactorChecker;
import com.android.wallpaper.module.FormFactorChecker.FormFactor;
import com.android.wallpaper.module.Injector;
import com.android.wallpaper.module.InjectorProvider;
import com.android.wallpaper.module.PackageStatusNotifier;
-import com.android.wallpaper.module.RotatingWallpaperComponentChecker;
import com.android.wallpaper.module.WallpaperChangedNotifier;
import com.android.wallpaper.module.WallpaperPersister;
import com.android.wallpaper.module.WallpaperPersister.Destination;
@@ -116,7 +114,6 @@ public class IndividualPickerFragment extends Fragment
WallpaperPreferences mWallpaperPreferences;
WallpaperChangedNotifier mWallpaperChangedNotifier;
- RotatingWallpaperComponentChecker mRotatingWallpaperComponentChecker;
RecyclerView mImageGrid;
IndividualAdapter mAdapter;
WallpaperCategory mCategory;
@@ -250,8 +247,6 @@ public class IndividualPickerFragment extends Fragment
mWallpaperChangedNotifier = WallpaperChangedNotifier.getInstance();
mWallpaperChangedNotifier.registerListener(mWallpaperChangedListener);
- mRotatingWallpaperComponentChecker = injector.getRotatingWallpaperComponentChecker();
-
mFormFactor = injector.getFormFactorChecker(appContext).getFormFactor();
mPackageStatusNotifier = injector.getPackageStatusNotifier(appContext);
@@ -445,7 +440,8 @@ public class IndividualPickerFragment extends Fragment
public void onResume() {
super.onResume();
- WallpaperPreferences preferences = InjectorProvider.getInjector().getPreferences(getActivity());
+ WallpaperPreferences preferences = InjectorProvider.getInjector()
+ .getPreferences(getActivity());
preferences.setLastAppActiveTimestamp(new Date().getTime());
// Reset Glide memory settings to a "normal" level of usage since it may have been lowered in
@@ -541,31 +537,23 @@ public class IndividualPickerFragment extends Fragment
* state of the user's device and binds the state of the current category's rotation to the "start
* rotation" tile.
*/
- private void refreshRotationHolder(final RotationHolder rotationHolder) {
+ private void refreshRotationHolder(RotationHolder rotationHolder) {
mWallpaperRotationInitializer.fetchRotationInitializationState(getContext(),
- new RotationStateListener() {
- @Override
- public void onRotationStateReceived(
- @RotationInitializationState final int rotationInitializationState) {
-
- // Update the UI state of the "start rotation" tile displayed on screen. Do this in a
- // Handler so it is scheduled at the end of the message queue. This is necessary to
- // ensure we do not remove or add data from the adapter while the layout is still being
- // computed. RecyclerView documentation therefore recommends performing such changes in
- // a Handler.
- new android.os.Handler().post(new Runnable() {
- @Override
- public void run() {
- // A config change may have destroyed the activity since the refresh started, so
- // check for that to avoid an NPE.
- if (getActivity() == null) {
- return;
- }
+ rotationState -> {
+ // Update the UI state of the "start rotation" tile displayed on screen.
+ // Do this in a Handler so it is scheduled at the end of the message queue.
+ // This is necessary to ensure we do not remove or add data from the adapter
+ // while the layout is still being computed. RecyclerView documentation
+ // therefore recommends performing such changes in a Handler.
+ new Handler().post(() -> {
+ // A config change may have destroyed the activity since the refresh
+ // started, so check for that to avoid an NPE.
+ if (getActivity() == null) {
+ return;
+ }
- rotationHolder.bindRotationInitializationState(rotationInitializationState);
- }
- });
- }
+ rotationHolder.bindRotationInitializationState(rotationState);
+ });
});
}
@@ -614,34 +602,33 @@ public class IndividualPickerFragment extends Fragment
// app before the first wallpaper image in rotation finishes downloading.
Activity activity = getActivity();
- if (activity != null
- && mWallpaperRotationInitializer
- .isNoBackupImageWallpaperPreviewNeeded(appContext)) {
- ((IndividualPickerActivity) activity).showNoBackupImageWallpaperPreview();
- } else {
- if (mWallpaperRotationInitializer.startRotation(appContext)) {
- if (activity != null && mFormFactor == FormFactorChecker.FORM_FACTOR_MOBILE) {
- try {
- Toast.makeText(getActivity(), R.string.wallpaper_set_successfully_message,
- Toast.LENGTH_SHORT).show();
- } catch (NotFoundException e) {
- Log.e(TAG, "Could not show toast " + e);
- }
- activity.setResult(Activity.RESULT_OK);
- activity.finish();
- } else if (mFormFactor == FormFactorChecker.FORM_FACTOR_DESKTOP) {
- mAdapter.updateSelectedTile(SPECIAL_FIXED_TILE_ADAPTER_POSITION);
- }
- } else { // Failed to start rotation.
- showStartRotationErrorDialog(networkPreference);
-
- if (mFormFactor == FormFactorChecker.FORM_FACTOR_DESKTOP) {
- DesktopRotationHolder rotationViewHolder =
- (DesktopRotationHolder) mImageGrid.findViewHolderForAdapterPosition(
- SPECIAL_FIXED_TILE_ADAPTER_POSITION);
- rotationViewHolder.setSelectionState(SelectableHolder.SELECTION_STATE_DESELECTED);
+ if (mWallpaperRotationInitializer.startRotation(appContext)) {
+ if (activity != null
+ && mFormFactor == FormFactorChecker.FORM_FACTOR_MOBILE) {
+ try {
+ Toast.makeText(getActivity(),
+ R.string.wallpaper_set_successfully_message,
+ Toast.LENGTH_SHORT).show();
+ } catch (NotFoundException e) {
+ Log.e(TAG, "Could not show toast " + e);
}
+
+ activity.setResult(Activity.RESULT_OK);
+ activity.finish();
+ } else if (mFormFactor == FormFactorChecker.FORM_FACTOR_DESKTOP) {
+ mAdapter.updateSelectedTile(SPECIAL_FIXED_TILE_ADAPTER_POSITION);
+ }
+ } else { // Failed to start rotation.
+ showStartRotationErrorDialog(networkPreference);
+
+ if (mFormFactor == FormFactorChecker.FORM_FACTOR_DESKTOP) {
+ DesktopRotationHolder rotationViewHolder =
+ (DesktopRotationHolder)
+ mImageGrid.findViewHolderForAdapterPosition(
+ SPECIAL_FIXED_TILE_ADAPTER_POSITION);
+ rotationViewHolder.setSelectionState(
+ SelectableHolder.SELECTION_STATE_DESELECTED);
}
}
}
@@ -690,11 +677,7 @@ public class IndividualPickerFragment extends Fragment
* Returns whether rotation is enabled for this category.
*/
boolean isRotationEnabled() {
- boolean isRotationSupported =
- mRotatingWallpaperComponentChecker.getRotatingWallpaperSupport(getContext())
- == RotatingWallpaperComponentChecker.ROTATING_WALLPAPER_SUPPORT_SUPPORTED;
-
- return isRotationSupported && mWallpaperRotationInitializer != null;
+ return mWallpaperRotationInitializer != null;
}
@Override
@@ -732,10 +715,10 @@ public class IndividualPickerFragment extends Fragment
super(itemView);
itemView.setOnClickListener(this);
- mTileLayout = (FrameLayout) itemView.findViewById(R.id.daily_refresh);
- mRotationMessage = (TextView) itemView.findViewById(R.id.rotation_tile_message);
- mRotationTitle = (TextView) itemView.findViewById(R.id.rotation_tile_title);
- mRefreshIcon = (ImageView) itemView.findViewById(R.id.rotation_tile_refresh_icon);
+ mTileLayout = itemView.findViewById(R.id.daily_refresh);
+ mRotationMessage = itemView.findViewById(R.id.rotation_tile_message);
+ mRotationTitle = itemView.findViewById(R.id.rotation_tile_title);
+ mRefreshIcon = itemView.findViewById(R.id.rotation_tile_refresh_icon);
mTileLayout.getLayoutParams().height = mTileSizePx.y;
// If the feature flag for "dynamic start rotation tile" is not enabled, fall back to the
@@ -749,7 +732,8 @@ public class IndividualPickerFragment extends Fragment
mRotationMessage.setTextColor(
getResources().getColor(R.color.rotation_tile_enabled_subtitle_text_color));
mRefreshIcon.setColorFilter(
- getResources().getColor(R.color.rotation_tile_enabled_refresh_icon_color), Mode.SRC_IN);
+ getResources().getColor(R.color.rotation_tile_enabled_refresh_icon_color),
+ Mode.SRC_IN);
return;
}
@@ -765,10 +749,7 @@ public class IndividualPickerFragment extends Fragment
@Override
public void onClick(View v) {
- boolean isLiveWallpaperNeeded = mWallpaperRotationInitializer
- .isNoBackupImageWallpaperPreviewNeeded(getActivity().getApplicationContext());
- DialogFragment startRotationDialogFragment = StartRotationDialogFragment
- .newInstance(isLiveWallpaperNeeded);
+ DialogFragment startRotationDialogFragment = new StartRotationDialogFragment();
startRotationDialogFragment.setTargetFragment(
IndividualPickerFragment.this, UNUSED_REQUEST_CODE);
startRotationDialogFragment.show(getFragmentManager(), TAG_START_ROTATION_DIALOG);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 00:34:03 +0000