PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update private space setup string and loading screen title" into main

Browse Source
This commit is contained in:
Joseph Vincent
2023-12-07 22:16:19 +00:00
committed by Android (Google) Code Review
parent 62702e3c47 992f6b97dd
commit e6b9290a0e
15 changed files with 103 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/privatespace_account_login_error.xml
View File

@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_retry_signin_title"
app:sudDescriptionText="@string/privatespace_retry_summary"
app:sucHeaderText="@string/private_space_retry_signin_title"
app:sudDescriptionText="@string/private_space_retry_summary"
android:icon="@drawable/ic_error_red">
</com.google.android.setupdesign.GlifLayout>

4
res/layout/privatespace_advancing_screen.xml
View File

@@ -17,7 +17,7 @@
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/privatesapce_autoadvance_screen"
android:id="@+id/private_space_autoadvance_screen"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_privatespace_icon">
@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="@string/privatespace_setting_up_text"
android:text="@string/private_space_setting_up_text"
android:layout_marginBottom="24dp"/>
</LinearLayout>

5
res/layout/privatespace_creation_error.xml
View File

@@ -17,11 +17,10 @@
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/privatespace_setup_error"
android:id="@+id/private_space_setup_error"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_error_screen_title"
app:sudDescriptionText="@string/privatespace_error_screen_summary"
app:sucHeaderText="@string/private_space_error_screen_title"
android:icon="@drawable/ic_warning_circle_red">
</com.google.android.setupdesign.GlifLayout>

54
res/layout/privatespace_education_screen.xml
View File

@@ -21,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_setup_title"
app:sudDescriptionText="@string/privatespace_hide_apps_summary"
app:sucHeaderText="@string/private_space_setup_title"
app:sudDescriptionText="@string/private_space_hide_apps_summary"
android:icon="@drawable/ic_privatespace_icon">
<ScrollView
android:id="@+id/main_clear_scrollview"
@@ -43,7 +43,29 @@
android:src="@drawable/privatespace_placeholder_image"/>
<TextView
style="@style/PrivateSpaceSetupSubHeaderStyle"
android:text="@string/privatespace_how_title"/>
android:text="@string/private_space_how_title"/>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/lockIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_lock_closed" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/lockIcon"
android:text="@string/private_space_protected_lock_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/bellIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_notifications" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/bellIcon"
android:text="@string/private_space_hidden_notifications_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle"
android:layout_width="fill_parent"
@@ -55,29 +77,7 @@
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/appsIcon"
android:text="@string/privatespace_access_bottom_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/lockIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_lock_closed" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/lockIcon"
android:text="@string/privatespace_protected_lock_text"/>
</RelativeLayout>
<RelativeLayout
style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
<ImageView
android:id="@+id/bellIcon"
style="@style/PrivateSpaceBulletPointIconStyle"
android:src="@drawable/ic_notifications" />
<TextView
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:layout_toRightOf="@+id/bellIcon"
android:text="@string/privatespace_hidden_notifications_text"/>
android:text="@string/private_space_access_bottom_text"/>
</RelativeLayout>
<Space
android:layout_width="wrap_content"
@@ -94,7 +94,7 @@
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:textSize = "14sp"
android:layout_toRightOf="@+id/infoIcon"
android:text="@string/privatespace_apps_permission_text"/>
android:text="@string/private_space_apps_permission_text"/>
</RelativeLayout>
</LinearLayout>
</ScrollView>

4
res/layout/privatespace_setlock_screen.xml
View File

@@ -21,8 +21,8 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_lockscreen_title"
app:sudDescriptionText="@string/privatespace_lockscreen_summary"
app:sucHeaderText="@string/private_space_lockscreen_title"
app:sudDescriptionText="@string/private_space_lockscreen_summary"
android:icon="@drawable/ic_lock">
<com.google.android.setupdesign.view.FillContentLayout
style="@style/SudContentFrame"

6
res/layout/privatespace_setup_success.xml
View File

@@ -17,11 +17,11 @@
<com.google.android.setupdesign.GlifLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/privatespace_setup_success"
android:id="@+id/private_space_setup_success"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:filterTouchesWhenObscured="true"
app:sucHeaderText="@string/privatespace_success_title"
app:sudDescriptionText="@string/privatespace_access_text"
app:sucHeaderText="@string/private_space_success_title"
app:sudDescriptionText="@string/private_space_access_text"
android:icon="@drawable/ic_privatespace_done">
</com.google.android.setupdesign.GlifLayout>

98
res/values/strings.xml
View File

@@ -1253,63 +1253,61 @@
<!-- Title of the Alert Dialog when no screen lock is set [CHAR LIMIT=30] -->
<string name="no_device_lock_title">Set a screen lock</string>
<!-- Summary of the alert when no screen lock is set [CHAR LIMIT=90] -->
<string name="no_device_lock_summary">To use Private Space, set a screen lock on this device.</string>
<string name="no_device_lock_summary">To use your private space, set a screen lock on this device</string>
<!-- Action label for dialog when no screen lock is set [CHAR LIMIT=30] -->
<string name="no_device_lock_action_label">Set screen lock</string>
<!-- Action label to cancel Alert dialog when no screen lock is set [CHAR LIMIT=30] -->
<string name="no_device_lock_cancel">Cancel</string>
<!-- Action label to cancel Private Space Setup flow [CHAR LIMIT=30] -->
<string name="privatespace_cancel_label">Cancel</string>
<!-- Label for Private Space setup button to create Private Space [CHAR LIMIT=30] -->
<string name="privatespace_setup_button_label">Set up</string>
<!-- Action label to cancel private space Setup flow [CHAR LIMIT=30] -->
<string name="private_space_cancel_label">Cancel</string>
<!-- Label for private space setup button to create private space [CHAR LIMIT=30] -->
<string name="private_space_setup_button_label">Set up</string>
<!-- Title for Private Space setup education screen. [CHAR LIMIT=50] -->
<string name="privatespace_setup_title">Set up Private Space</string>
<!-- Summary for the Private Space setup education screen. [CHAR LIMIT=NONE] -->
<string name="privatespace_hide_apps_summary">Hide private apps in a secure space that only you can access</string>
<!-- Text shown in Private Space setup screen which explains how the Private Space works [CHAR LIMIT=50] -->
<string name="privatespace_how_title">How it works</string>
<!-- Text shown in Private Space setup screen which explains Private Space can be accessed from bottom of all apps list. [CHAR LIMIT=NONE] -->
<string name="privatespace_access_bottom_text">You can access Private Space from the bottom of your apps list</string>
<!-- Text shown in Private Space setup screen which explains Private Space apps are protected by a lock. [CHAR LIMIT=60] -->
<string name="privatespace_protected_lock_text">Apps in Private Space are protected by a lock</string>
<!-- Text shown in Private Space setup screen which explains notifications from Private Space apps will not be shown when Private Space is locked. [CHAR LIMIT=NONE] -->
<string name="privatespace_hidden_notifications_text">Notifications from apps in Private Space are hidden when it\u2019s locked</string>
<!-- Text shown in Private Space setup screen which explains that the permissions granted to Private Space apps will not be shown in settings when Private Space is locked. [CHAR LIMIT=NONE] -->
<string name="privatespace_apps_permission_text">Private Space apps won\u2019t appear in permission manager, privacy dashboard, and other settings when Private Space is locked</string>
<!-- Text shown at the bottom in Private Space auto advancing screens. [CHAR LIMIT=60] -->
<string name="privatespace_setting_up_text">Setting up Private Space\u2026</string>
<!-- Title for Private Space setup in auto advancing screen informing private space is hidden when locked. [CHAR LIMIT=NONE] -->
<string name="privatespace_apps_hidden_title">Usage info for Private Space apps is hidden when it\u2019s locked</string>
<!-- Title for Private Space setup in auto advancing screen informing private space can be accessed from apps list. [CHAR LIMIT=60] -->
<string name="privatespace_access_from_apps_title">Access Private Space from your apps list</string>
<!-- Title for Private Space setup in auto advancing screen informing some system apps are already installed in Private Space. [CHAR LIMIT=NONE] -->
<string name="privatespace_system_apps_installed_title">Some system apps are already installed in Private Space</string>
<!-- Title for Private Space creation error screen. [CHAR LIMIT=60] -->
<string name="privatespace_error_screen_title">Couldn\u2019t set up Private Space</string>
<!-- Summary for the Private Space creation error screen. [CHAR LIMIT=60] -->
<string name="privatespace_error_screen_summary">Try again now, or come back later</string>
<string name="private_space_setup_title">Set up a private space</string>
<!-- Summary for the private space setup education screen. [CHAR LIMIT=NONE] -->
<string name="private_space_hide_apps_summary">Keep private apps in a separate space that you can hide or lock</string>
<!-- Text shown in private space setup screen which explains how the private space works [CHAR LIMIT=50] -->
<string name="private_space_how_title">How it works</string>
<!-- Text shown in private space setup screen which explains private space can be accessed from bottom of all apps list. [CHAR LIMIT=NONE] -->
<string name="private_space_access_bottom_text">You can access your private space from the bottom of your apps list</string>
<!-- Text shown in private space setup screen which explains private space apps are protected by a lock. [CHAR LIMIT=60] -->
<string name="private_space_protected_lock_text">Apps in your private space are protected by a lock</string>
<!-- Text shown in private space setup screen which explains notifications from private space apps will not be shown when private space is locked. [CHAR LIMIT=NONE] -->
<string name="private_space_hidden_notifications_text">Notifications from apps in your private space are hidden when it\u2019s locked</string>
<!-- This is info text to help explain in private space setup screen that the permissions granted to private space apps will not be shown in settings when private space is locked. [CHAR LIMIT=NONE] -->
<string name="private_space_apps_permission_text">Apps in your private space won\'t appear in permission manager, privacy dashboard, and other settings when your private space is locked.\n\nYour private space can\'t be moved to a new device. You\'ll need to set up another private space if you want to use it on another device.\n\nAnyone that connects your device to a computer or installs harmful apps on your device may be able to access your private space.</string>
<!-- Text shown at the bottom in private space auto advancing screens. [CHAR LIMIT=60] -->
<string name="private_space_setting_up_text">Setting up private space\u2026</string>
<!-- Title for private space setup in auto advancing screen informing private space notifications are hidden when locked. [CHAR LIMIT=NONE] -->
<string name="private_space_notifications_hidden_title">Notifications from apps in private space are hidden when it\u2019s locked</string>
<!-- Title for private space setup in auto advancing screen informing photos/files from private space can be shared when unlocked. [CHAR LIMIT=NONE] -->
<string name="private_space_share_photos_title">Unlock your space to share photos or files from private space apps</string>
<!-- Title for private space setup in auto advancing screen informing some system apps are already installed in private space. [CHAR LIMIT=NONE] -->
<string name="private_space_apps_installed_title">Some apps are already installed in your private space</string>
<!-- Title for private space creation error screen. [CHAR LIMIT=60] -->
<string name="private_space_error_screen_title">Couldn\u2019t set up private space</string>
<!-- Label for button to retry creating private space again on creation error. [CHAR LIMIT=30] -->
<string name="privatespace_tryagain_label">Try Again</string>
<!-- Title for Private Space lock setup screen. [CHAR LIMIT=50] -->
<string name="privatespace_lockscreen_title">Use screen lock to unlock?</string>
<!-- Summary for the Private Space lock setup screen. [CHAR LIMIT=NONE] -->
<string name="privatespace_lockscreen_summary">You can unlock Private Space the same way you unlock your device, or choose a different lock</string>
<!-- Action label to use existing device lock for Private Space. [CHAR LIMIT=50] -->
<string name="privatespace_use_screenlock_label">Use screen lock</string>
<!-- Label for Private Space lock setup button to choose a new lock. [CHAR LIMIT=50] -->
<string name="privatespace_set_lock_label">Choose new lock</string>
<!-- Title for Private Space setup success screen. [CHAR LIMIT=30] -->
<string name="privatespace_success_title">All set!</string>
<!-- Summary for the Private Space setup success screen. [CHAR LIMIT=NONE] -->
<string name="privatespace_access_text">You can access Private Space from your apps list</string>
<!-- Label for Private Space done button to show a toast, finish setup and launch All apps [CHAR LIMIT=30] -->
<string name="privatespace_done_label">Done</string>
<string name="private_space_tryagain_label">Try Again</string>
<!-- Title for private space lock setup screen. [CHAR LIMIT=50] -->
<string name="private_space_lockscreen_title">Use screen lock to unlock private space?</string>
<!-- Summary for the private space lock setup screen. [CHAR LIMIT=NONE] -->
<string name="private_space_lockscreen_summary">You can unlock your private space the same way you unlock your device, or choose a different lock</string>
<!-- Action label to use existing device lock for private space. [CHAR LIMIT=50] -->
<string name="private_space_use_screenlock_label">Use screen lock</string>
<!-- Label for private space lock setup button to choose a new lock. [CHAR LIMIT=50] -->
<string name="private_space_set_lock_label">Choose new lock</string>
<!-- Title for private space setup success screen. [CHAR LIMIT=30] -->
<string name="private_space_success_title">All set!</string>
<!-- Summary for the private space setup success screen. [CHAR LIMIT=NONE] -->
<string name="private_space_access_text">To access your private space, go to your apps list then scroll down</string>
<!-- Label for private space done button to show a toast, finish setup and launch All apps [CHAR LIMIT=30] -->
<string name="private_space_done_label">Done</string>
<!-- Toast to show on private space setup completion informing user to scroll down All apps to access private space. [CHAR LIMIT=60] -->
<string name="scrolldown_to_access">Scroll down to access Private Space</string>
<!-- Title for Private Space account login error screen. [CHAR LIMIT=60] -->
<string name="privatespace_retry_signin_title">Sign in to set up Private Space</string>
<!-- Summary for the Private Space account login error screen. [CHAR LIMIT=NONE] -->
<string name="privatespace_retry_summary">You need to sign in to an account to set up Private Space</string>
<string name="private_space_scrolldown_to_access">Scroll down to find private space</string>
<!-- Title for private space account login error screen. [CHAR LIMIT=60] -->
<string name="private_space_retry_signin_title">Sign in to set up a private space</string>
<!-- Summary for the private space account login error screen. [CHAR LIMIT=NONE] -->
<string name="private_space_retry_summary">You need to sign in to an account to set up a private space</string>
<!-- private space lock setup screen title. This title is asking the user to choose a type of screen lock (such as a pattern, PIN, or password) that they need to enter to unlock private space. [CHAR LIMIT=60] -->
<string name="private_space_lock_setup_title">Choose a lock for your private space</string>
<!-- private space lock setup screen description [CHAR LIMIT=NONE] -->

39
res/xml/privatespace_setup_education_entries.xml
View File

@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ 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.
-->
<ItemGroup
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<Item
android:enabled="false"
android:icon="@drawable/ic_apps"
android:title="@string/privatespace_access_bottom_text"
app:sudIconTint="?android:attr/textColorSecondary"/>
<Item
android:enabled="false"
android:icon="@drawable/ic_lock_24dp"
android:title="@string/privatespace_protected_lock_text"
app:sudIconTint="?android:attr/textColorSecondary"/>
<Item
android:enabled="false"
android:icon="@drawable/ic_notifications"
android:title="@string/privatespace_hidden_notifications_text"
app:sudIconTint="?android:attr/textColorSecondary"/>
</ItemGroup>

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

@@ -52,16 +52,17 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
private static final String TITLE_INDEX = "title_index";
private static final int DELAY_BETWEEN_SCREENS = 5000; // 5 seconds in millis
private static final int ANIMATION_DURATION_MILLIS = 500;
private static final int HEADER_TEXT_MAX_LINES = 4;
private GlifLayout mRootView;
private Handler mHandler;
private int mScreenTitleIndex;
private static final List<Pair<Integer, Integer>> HEADER_IMAGE_PAIRS =
ImmutableList.of(
new Pair(R.string.privatespace_apps_hidden_title,
new Pair(R.string.private_space_notifications_hidden_title,
R.drawable.privatespace_setup_flow_placeholder),
new Pair(R.string.privatespace_access_from_apps_title,
new Pair(R.string.private_space_share_photos_title,
R.drawable.privatespace_setup_flow_placeholder),
new Pair(R.string.privatespace_system_apps_installed_title,
new Pair(R.string.private_space_apps_installed_title,
R.drawable.privatespace_setup_flow_placeholder));
private Runnable mUpdateScreenResources =
@@ -116,6 +117,7 @@ public class AutoAdvanceSetupFragment extends InstrumentedFragment {
mRootView =
(GlifLayout)
inflater.inflate(R.layout.privatespace_advancing_screen, container, false);
mRootView.getHeaderTextView().setMaxLines(HEADER_TEXT_MAX_LINES);
updateHeaderAndImage();
mHandler = new Handler(Looper.getMainLooper());
mHandler.postDelayed(mUpdateScreenResources, DELAY_BETWEEN_SCREENS);

4
src/com/android/settings/privatespace/PrivateProfileCreationError.java
View File

@@ -47,14 +47,14 @@ public class PrivateProfileCreationError extends InstrumentedFragment {
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())
.setText(R.string.privatespace_tryagain_label)
.setText(R.string.private_space_tryagain_label)
.setListener(onTryAgain())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build());
mixin.setSecondaryButton(
new FooterButton.Builder(getContext())
.setText(R.string.privatespace_cancel_label)
.setText(R.string.private_space_cancel_label)
.setListener(onCancel())
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(

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

@@ -51,7 +51,7 @@ public class PrivateSpaceAccountLoginError extends InstrumentedFragment {
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())
.setText(R.string.privatespace_tryagain_label)
.setText(R.string.private_space_tryagain_label)
.setListener(nextScreen())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)

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

@@ -50,14 +50,14 @@ public class PrivateSpaceEducation extends InstrumentedFragment {
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())
.setText(R.string.privatespace_setup_button_label)
.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.privatespace_cancel_label)
.setText(R.string.private_space_cancel_label)
.setListener(onCancel())
.setButtonType(FooterButton.ButtonType.CANCEL)
.setTheme(

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

@@ -60,14 +60,14 @@ public class PrivateSpaceSetLockFragment extends InstrumentedFragment {
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())
.setText(R.string.privatespace_use_screenlock_label)
.setText(R.string.private_space_use_screenlock_label)
.setListener(onClickUse())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
.build());
mixin.setSecondaryButton(
new FooterButton.Builder(getContext())
.setText(R.string.privatespace_set_lock_label)
.setText(R.string.private_space_set_lock_label)
.setListener(onClickNewLock())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(

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

@@ -55,7 +55,7 @@ public class SetupSuccessFragment extends InstrumentedFragment {
final FooterBarMixin mixin = rootView.getMixin(FooterBarMixin.class);
mixin.setPrimaryButton(
new FooterButton.Builder(getContext())
.setText(R.string.privatespace_done_label)
.setText(R.string.private_space_done_label)
.setListener(onClickNext())
.setButtonType(FooterButton.ButtonType.NEXT)
.setTheme(com.google.android.setupdesign.R.style.SudGlifButton_Primary)
@@ -104,6 +104,7 @@ public class SetupSuccessFragment extends InstrumentedFragment {
}
private void accessPrivateSpaceToast() {
Toast.makeText(getContext(), R.string.scrolldown_to_access, Toast.LENGTH_SHORT).show();
Toast.makeText(getContext(), R.string.private_space_scrolldown_to_access,
Toast.LENGTH_SHORT).show();
}
}

4
src/com/android/settings/privatespace/onelock/UseOneLockControllerSwitch.java
View File

@@ -192,7 +192,7 @@ public class UseOneLockControllerSwitch extends AbstractPreferenceController
new AlertDialog.Builder(mContext)
.setMessage(R.string.private_space_new_lock_title)
.setPositiveButton(
R.string.privatespace_set_lock_label,
R.string.private_space_set_lock_label,
(dialog, which) -> {
Intent intent = new Intent(mContext,
PrivateProfileContextHelperActivity.class);
@@ -201,7 +201,7 @@ public class UseOneLockControllerSwitch extends AbstractPreferenceController
UNUNIFY_PRIVATE_LOCK_FROM_DEVICE_REQUEST,
/*Options*/ null, mUserHandle);
})
.setNegativeButton(R.string.privatespace_cancel_label,
.setNegativeButton(R.string.private_space_cancel_label,
(DialogInterface dialog, int which) -> {
mUnifyProfile.setChecked(true);
dialog.dismiss();