This includes below changes based on the updated UX mocks: - Add one more loading screen in setup flow - Update feature intro text on Setup page - To swap order of bullets on the setup intro screen - Update "Private Space" to "private space" in setup flow screens go/ss/7pVGBSPqezDek47.png go/ss/ADLX8aXAAGgYQHD.png go/ss/tYtrGypBgRuXM9V.png go/ss/3zZfij6JDpudwYR.png go/ss/BFtWegFZyTueQoT.png Recording link - b/313654776#comment5 Bug: 313654776, 313882412, 313655290 Test: Verify title and text is same as UX flow Change-Id: I6a985c4fd6ecbe8ddd11e36bf76a2a9cc8427ef5
96 lines
3.5 KiB
Java
96 lines
3.5 KiB
Java
/*
|
|
* Copyright (C) 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.android.settings.privatespace;
|
|
|
|
import android.app.Activity;
|
|
import android.app.settings.SettingsEnums;
|
|
import android.os.Bundle;
|
|
import android.view.LayoutInflater;
|
|
import android.view.View;
|
|
import android.view.ViewGroup;
|
|
|
|
import androidx.annotation.Nullable;
|
|
import androidx.navigation.fragment.NavHostFragment;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settings.core.InstrumentedFragment;
|
|
|
|
import com.google.android.setupcompat.template.FooterBarMixin;
|
|
import com.google.android.setupcompat.template.FooterButton;
|
|
import com.google.android.setupdesign.GlifLayout;
|
|
|
|
/** Fragment educating about the usage of Private Space. */
|
|
public class PrivateSpaceEducation extends InstrumentedFragment {
|
|
|
|
@Override
|
|
public View onCreateView(
|
|
LayoutInflater inflater,
|
|
@Nullable ViewGroup container,
|
|
@Nullable Bundle savedInstanceState) {
|
|
if (!android.os.Flags.allowPrivateProfile()) {
|
|
return null;
|
|
}
|
|
GlifLayout rootView =
|
|
(GlifLayout)
|
|
inflater.inflate(R.layout.privatespace_education_screen, container, false);
|
|
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
|
|
mixin.setPrimaryButton(
|
|
new FooterButton.Builder(getContext())
|
|
.setText(R.string.private_space_setup_button_label)
|
|
.setListener(onSetup())
|
|
.setButtonType(FooterButton.ButtonType.NEXT)
|
|
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
|
|
.build());
|
|
mixin.setSecondaryButton(
|
|
new FooterButton.Builder(getContext())
|
|
.setText(R.string.private_space_cancel_label)
|
|
.setListener(onCancel())
|
|
.setButtonType(FooterButton.ButtonType.CANCEL)
|
|
.setTheme(
|
|
androidx.appcompat.R.style
|
|
.Base_TextAppearance_AppCompat_Widget_Button)
|
|
.build());
|
|
|
|
return rootView;
|
|
}
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return SettingsEnums.PRIVATE_SPACE_SETUP_EDUCATION;
|
|
}
|
|
|
|
private View.OnClickListener onSetup() {
|
|
return v -> {
|
|
mMetricsFeatureProvider.action(
|
|
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_START);
|
|
NavHostFragment.findNavController(PrivateSpaceEducation.this)
|
|
.navigate(R.id.action_education_to_auto_advance);
|
|
};
|
|
}
|
|
|
|
private View.OnClickListener onCancel() {
|
|
return v -> {
|
|
Activity activity = getActivity();
|
|
if (activity != null) {
|
|
mMetricsFeatureProvider.action(
|
|
getContext(), SettingsEnums.ACTION_PRIVATE_SPACE_SETUP_CANCEL);
|
|
activity.finish();
|
|
}
|
|
};
|
|
}
|
|
}
|