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

Merge "Add entrypoint for Learn More in PS settings & Setup intro" into main

Browse Source
This commit is contained in:
Joseph Vincent
2024-03-15 07:39:16 +00:00
committed by Android (Google) Code Review
parent 67bfb4141f 1af33733c6
commit f2f44f50de
6 changed files with 172 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
res/layout/private_space_education_screen.xml
View File

@@ -93,10 +93,19 @@
android:layout_height="18dp"
android:src="@drawable/ic_info_outline_24dp" />
<TextView
android:id="@+id/info"
style="@style/PrivateSpaceBulletPointTextFontStyle"
android:textSize = "14sp"
android:layout_toRightOf="@+id/infoIcon"
android:text="@string/private_space_apps_permission_text"/>
<TextView
android:id="@+id/learn_more"
style="@style/PrivateSpaceSetupSubHeaderStyle"
android:layout_below="@id/info"
android:layout_alignLeft="@+id/info"
android:paddingTop="24dp"
android:paddingLeft="16dp"
android:text="@string/private_space_learn_more_text"/>
</RelativeLayout>
</LinearLayout>
</ScrollView>

3
res/values/strings.xml
View File

@@ -1317,6 +1317,9 @@
<string name="private_space_install_apps_text"><b>Install apps</b>\nYour private space has its own Play Store so you can install apps easily.</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>
<!-- Private space footer link content description [CHAR LIMIT=40] -->
<string name="private_space_learn_more_text">Learn more about private space</string>
<string name="private_space_learn_more_url" translatable="false">https://support.google.com/android?p=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] -->

6
res/xml/private_space_settings.xml
View File

@@ -81,10 +81,12 @@
</PreferenceCategory>
<com.android.settings.accessibility.AccessibilityFooterPreference
<com.android.settingslib.widget.FooterPreference
android:key="private_space_footer"
android:title="@string/private_space_apps_permission_text"
android:selectable="false"
settings:searchable="false"/>
settings:searchable="false"
settings:controller="com.android.settings.privatespace.PrivateSpaceFooterPreferenceController"/>
</PreferenceScreen>