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

Commit db315e64 authored by Joseph Vincent's avatar Joseph Vincent Committed by Android (Google) Code Review
Browse files

Merge changes I6387c999,I470e5c6e into main 

* changes:
  Update illustrations in Private Space setup & settings
  Replace autoadvance screens with waiting screen in PS setup
parents a3d8978f f145d0e9

res/drawable/ic_private_space_icon.xml

+6 −6
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

        android:viewportWidth="960"

        android:viewportHeight="960"

        android:tint="?android:attr/colorAccent">

    <path

    android:pathData="M5,3H19C20.1,3 21,3.9 21,5V19C21,20.1 20.1,21 19,21H5C3.9,21 3,20.1 3,19V5C3,3.9 3.9,3 5,3ZM13.5,15.501L12.93,12.271C13.57,11.941 14,11.271 14,10.501C14,9.401 13.1,8.501 12,8.501C10.9,8.501 10,9.401 10,10.501C10,11.271 10.43,11.941 11.07,12.271L10.5,15.501H13.5Z"

        android:fillColor="?android:attr/colorAccent"

    android:fillType="evenOdd"/>

        android:pathData="M480,440Q455,440 437.5,422.5Q420,405 420,380Q420,355 437.5,337.5Q455,320 480,320Q505,320 522.5,337.5Q540,355 540,380Q540,405 522.5,422.5Q505,440 480,440ZM480,880Q341,845 250.5,720.5Q160,596 160,444L160,200L480,80L800,200L800,444Q800,596 709.5,720.5Q619,845 480,880ZM440,720L520,720L520,680L600,680L600,600L520,600L520,514Q564,501 592,464.5Q620,428 620,380Q620,322 579,281Q538,240 480,240Q422,240 381,281Q340,322 340,380Q340,428 368,464.5Q396,501 440,514L440,720Z"/>

</vector>

res/layout/private_space_confirm_deletion.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,6 +25,6 @@ 
    android:icon="@drawable/ic_delete_accent"

    app:sudUsePartnerHeavyTheme="true"

    app:sudIllustrationType="default"

    app:sudDescriptionText = "@string/private_space_confirm_deletion_summary"

    app:sudDescriptionText = "@string/private_space_few_moments_text"

    app:sucHeaderText="@string/private_space_confirm_deletion_header">

</com.google.android.setupdesign.GlifLoadingLayout>
 
 No newline at end of file

res/layout/private_space_advancing_screen.xml→res/layout/private_space_create_screen.xml

+30 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~ 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.
@@ -14,33 +15,16 @@ 
  ~ limitations under the License.

  -->



<com.google.android.setupdesign.GlifLayout

<com.google.android.setupdesign.GlifLoadingLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:id="@+id/private_space_autoadvance_screen"

    android:id="@+id/private_space_create_screen"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_private_space_icon">

    <LinearLayout style="@style/SudContentFrame"

                  android:layout_width="match_parent"

                  android:layout_height="match_parent"

                  android:orientation="vertical">

        <com.airbnb.lottie.LottieAnimationView

            android:id="@+id/lottie_animation"

            style="@style/SudContentIllustration"

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_weight="1"

            app:lottie_rawRes="@null"/>



        <TextView

            android:id="@+id/createMessage"

            style="@style/PrivateSpaceSetupTextFontStyle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textSize="14sp"

            android:text="@string/private_space_setting_up_text"

            android:layout_marginBottom="24dp"/>



    </LinearLayout>

</com.google.android.setupdesign.GlifLayout>
 
    android:orientation="vertical"

    android:icon="@drawable/ic_private_space_icon"

    app:sudUsePartnerHeavyTheme="true"

    app:sudIllustrationType="default"

    app:sudDescriptionText = "@string/private_space_few_moments_text"

    app:sucHeaderText="@string/private_space_setting_up_text">

</com.google.android.setupdesign.GlifLoadingLayout>
 
 No newline at end of file

res/navigation/privatespace_main_context_nav.xml

+7 −7
Original line number Diff line number Diff line
@@ -23,14 +23,14 @@ 
              android:name="com.android.settings.privatespace.PrivateSpaceEducation"

              android:label="fragment_ps_education">

        <action

            android:id="@+id/action_education_to_auto_advance"

            app:destination="@id/ps_auto_advance_fragment"/>

            android:id="@+id/action_education_to_create"

            app:destination="@id/ps_create_fragment"/>

    </fragment>

    <fragment android:id="@+id/ps_auto_advance_fragment"

              android:name="com.android.settings.privatespace.AutoAdvanceSetupFragment"

              android:label="fragment_ps_auto_advance">

    <fragment android:id="@+id/ps_create_fragment"

              android:name="com.android.settings.privatespace.PrivateSpaceCreationFragment"

              android:label="fragment_ps_create">

        <action

            android:id="@+id/action_advance_profile_error"

            android:id="@+id/action_create_profile_error"

            app:destination="@id/ps_profile_error_fragment"/>

        <action

            android:id="@+id/action_set_lock_fragment"
@@ -44,7 +44,7 @@ 
              android:label="fragment_ps_error">

        <action

            android:id="@+id/action_retry_profile_creation"

            app:destination="@id/ps_auto_advance_fragment"/>

            app:destination="@id/ps_create_fragment"/>

    </fragment>

    <fragment android:id="@+id/ps_pre_finish_delay_fragment"

              android:name="com.android.settings.privatespace.SetupPreFinishDelayFragment"

res/raw/private_space_hide_when_locked_illustration.json

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.