Merge "Add entrypoint for Learn More in PS settings & Setup intro" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
f2f44f50de
@@ -19,10 +19,12 @@ package com.android.settings.privatespace;
|
||||
import android.app.Activity;
|
||||
import android.app.settings.SettingsEnums;
|
||||
import android.os.Bundle;
|
||||
import android.text.util.Linkify;
|
||||
import android.util.Log;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.TextView;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.navigation.fragment.NavHostFragment;
|
||||
@@ -34,6 +36,8 @@ import com.google.android.setupcompat.template.FooterBarMixin;
|
||||
import com.google.android.setupcompat.template.FooterButton;
|
||||
import com.google.android.setupdesign.GlifLayout;
|
||||
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/** Fragment educating about the usage of Private Space. */
|
||||
public class PrivateSpaceEducation extends InstrumentedFragment {
|
||||
private static final String TAG = "PrivateSpaceEducation";
|
||||
@@ -66,6 +70,13 @@ public class PrivateSpaceEducation extends InstrumentedFragment {
|
||||
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Secondary)
|
||||
.build());
|
||||
|
||||
TextView infoTextView = rootView.findViewById(R.id.learn_more);
|
||||
Pattern pattern = Pattern.compile(infoTextView.getText().toString());
|
||||
Linkify.addLinks(
|
||||
infoTextView,
|
||||
pattern,
|
||||
getContext().getString(R.string.private_space_learn_more_url));
|
||||
|
||||
return rootView;
|
||||
}
|
||||
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
/*
|
||||
* Copyright (C) 2024 The Android Open 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.content.Context;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settingslib.HelpUtils;
|
||||
import com.android.settingslib.widget.FooterPreference;
|
||||
|
||||
/** Preference controller for private space settings footer. */
|
||||
public class PrivateSpaceFooterPreferenceController extends BasePreferenceController {
|
||||
public PrivateSpaceFooterPreferenceController(
|
||||
@NonNull Context context, @NonNull String preferenceKey) {
|
||||
super(context, preferenceKey);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(@NonNull PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
FooterPreference preference = screen.findPreference(getPreferenceKey());
|
||||
setupFooter(preference);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return android.multiuser.Flags.enablePrivateSpaceFeatures()
|
||||
? AVAILABLE
|
||||
: UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void setupFooter(FooterPreference preference) {
|
||||
final String helpUri = mContext.getString(R.string.private_space_learn_more_url);
|
||||
if (!TextUtils.isEmpty(helpUri) && preference != null) {
|
||||
preference.setLearnMoreAction(
|
||||
v -> {
|
||||
mContext.startActivity(
|
||||
HelpUtils.getHelpIntent(
|
||||
mContext, helpUri, /* backupContext= */ ""));
|
||||
});
|
||||
preference.setLearnMoreText(mContext.getString(R.string.private_space_learn_more_text));
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user