Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 992f6b97 authored by josephpv's avatar josephpv
Browse files

Update private space setup string and loading screen title 

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
parent 85f0c655

res/layout/privatespace_account_login_error.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/layout/privatespace_advancing_screen.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

res/layout/privatespace_creation_error.xml

+2 −3
Original line number Diff line number Diff line
@@ -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>

res/layout/privatespace_education_screen.xml

+19 −19
Original line number Diff line number Diff line
@@ -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,20 +43,7 @@ 
            android:src="@drawable/privatespace_placeholder_image"/>

        <TextView

            style="@style/PrivateSpaceSetupSubHeaderStyle"

            android:text="@string/privatespace_how_title"/>

        <RelativeLayout

            style="@style/PrivateSpaceSetupBulletPointLayoutStyle"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content">

            <ImageView

                android:id="@+id/appsIcon"

                style="@style/PrivateSpaceBulletPointIconStyle"

                android:src="@drawable/ic_apps" />

            <TextView

                style="@style/PrivateSpaceBulletPointTextFontStyle"

                android:layout_toRightOf="@+id/appsIcon"

                android:text="@string/privatespace_access_bottom_text"/>

        </RelativeLayout>

            android:text="@string/private_space_how_title"/>

        <RelativeLayout

            style="@style/PrivateSpaceSetupBulletPointLayoutStyle">

            <ImageView
@@ -66,7 +53,7 @@ 
            <TextView

                style="@style/PrivateSpaceBulletPointTextFontStyle"

                android:layout_toRightOf="@+id/lockIcon"

                android:text="@string/privatespace_protected_lock_text"/>

                android:text="@string/private_space_protected_lock_text"/>

        </RelativeLayout>

        <RelativeLayout

            style="@style/PrivateSpaceSetupBulletPointLayoutStyle">
@@ -77,7 +64,20 @@ 
            <TextView

                style="@style/PrivateSpaceBulletPointTextFontStyle"

                android:layout_toRightOf="@+id/bellIcon"

                android:text="@string/privatespace_hidden_notifications_text"/>

                android:text="@string/private_space_hidden_notifications_text"/>

        </RelativeLayout>

        <RelativeLayout

            style="@style/PrivateSpaceSetupBulletPointLayoutStyle"

            android:layout_width="fill_parent"

            android:layout_height="wrap_content">

            <ImageView

                android:id="@+id/appsIcon"

                style="@style/PrivateSpaceBulletPointIconStyle"

                android:src="@drawable/ic_apps" />

            <TextView

                style="@style/PrivateSpaceBulletPointTextFontStyle"

                android:layout_toRightOf="@+id/appsIcon"

                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>

res/layout/privatespace_setlock_screen.xml

+2 −2
Original line number Diff line number Diff line
@@ -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"