Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add illustration to final screen in PS setup and update existing illustrations." into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-02-13 20:33:52 +00:00
committed by Android (Google) Code Review
parent 7046a96c9a e9f3a0925b
commit 13e570f104
16 changed files with 434 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/privatespace/AutoAdvanceSetupFragment.java
View File

@@ -59,11 +59,11 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
private static final List<Pair<Integer, Integer>> HEADER_IMAGE_PAIRS =
ImmutableList.of(
new Pair(R.string.private_space_notifications_hidden_title,
R.drawable.privatespace_setup_flow_placeholder),
R.drawable.private_space_setup_notification_illustration),
new Pair(R.string.private_space_share_photos_title,
R.drawable.privatespace_setup_flow_placeholder),
R.drawable.private_space_setup_sharing_illustration),
new Pair(R.string.private_space_apps_installed_title,
R.drawable.privatespace_setup_flow_placeholder));
R.drawable.private_space_setup_preinstalled_illustration));
private Runnable mUpdateScreenResources =
new Runnable() {
@@ -116,7 +116,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
}
mRootView =
(GlifLayout)
inflater.inflate(R.layout.privatespace_advancing_screen, container, false);
inflater.inflate(R.layout.private_space_advancing_screen, container, false);
mRootView.getHeaderTextView().setMaxLines(HEADER_TEXT_MAX_LINES);
updateHeaderAndImage();
mHandler = new Handler(Looper.getMainLooper());
@@ -157,7 +157,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
private void updateHeaderAndImage() {
mRootView.setHeaderText(HEADER_IMAGE_PAIRS.get(mScreenTitleIndex).first);
((ImageView) mRootView.findViewById(R.id.placeholder_image))
((ImageView) mRootView.findViewById(R.id.setup_advance_image))
.setImageResource(HEADER_IMAGE_PAIRS.get(mScreenTitleIndex).second);
startFadeInAnimation();
}
@@ -166,7 +166,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
ValueAnimator textView = ObjectAnimator.ofFloat(
mRootView.getHeaderTextView(), View.ALPHA, 0f, 1f);
ValueAnimator imageView = ObjectAnimator.ofFloat(
mRootView.findViewById(R.id.placeholder_image), View.ALPHA, 0, 1f);
mRootView.findViewById(R.id.setup_advance_image), View.ALPHA, 0, 1f);
AnimatorSet fadeIn = new AnimatorSet();
fadeIn.playTogether(textView, imageView);
fadeIn.setDuration(ANIMATION_DURATION_MILLIS).start();
@@ -177,7 +177,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
ValueAnimator textView = ObjectAnimator.ofFloat(
mRootView.getHeaderTextView(), View.ALPHA, 1f, 0f);
ValueAnimator imageView = ObjectAnimator.ofFloat(
mRootView.findViewById(R.id.placeholder_image), View.ALPHA, 1f, 0f);
mRootView.findViewById(R.id.setup_advance_image), View.ALPHA, 1f, 0f);
fadeOut.playTogether(textView, imageView);
fadeOut.setDuration(ANIMATION_DURATION_MILLIS).start();
fadeOut.addListener(new AnimatorListenerAdapter() {

2
src/com/android/settings/privatespace/PrivateSpaceEducation.java
View File

@@ -48,7 +48,7 @@ public class PrivateSpaceEducation extends InstrumentedFragment {
}
GlifLayout rootView =
(GlifLayout)
inflater.inflate(R.layout.privatespace_education_screen, container, false);
inflater.inflate(R.layout.private_space_education_screen, container, false);
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())

2
src/com/android/settings/privatespace/PrivateSpaceSetLockFragment.java
View File

@@ -56,7 +56,7 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment {
}
GlifLayout rootView =
(GlifLayout)
inflater.inflate(R.layout.privatespace_setlock_screen, container, false);
inflater.inflate(R.layout.private_space_setlock_screen, container, false);
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())

2
src/com/android/settings/privatespace/SetupSuccessFragment.java
View File

@@ -52,7 +52,7 @@ public class SetupSuccessFragment extends InstrumentedFragment {
}
GlifLayout rootView =
(GlifLayout)
inflater.inflate(R.layout.privatespace_setup_success, container, false);
inflater.inflate(R.layout.private_space_setup_success, container, false);
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())