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

Commit c0c0611a authored by Avner Cohen's avatar Avner Cohen
Browse files

Replace the Finder shutdown messages with identical messages with the new product name. 

Bug: 417428201
Test: TH
Flag: android.net.platform.flags.powered_off_finding_message_new_product_name
Change-Id: I64e347a6e06e074106e7978ba24c9253863ac35d
parent 872d3aa3

core/java/android/net/flags.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ flag { 
    bug: "307898240"

}



flag {

    name: "powered_off_finding_message_new_product_name"

    namespace: "nearby"

    description: "Controls whether the Powered Off Finding message uses the new product name"

    bug: "417428201"

}



flag {

  name: "register_nsd_offload_engine"

  is_exported: true

packages/SystemUI/res-product/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -183,4 +183,9 @@ 
    <string name="finder_active" product="default">You can locate this phone with Find My Device even when powered off</string>

    <string name="finder_active" product="tablet">You can locate this tablet with Find My Device even when powered off</string>



    <!-- Message shown during phone shutdown when Find Hub with Dead Battery Finder is active. Same as 2734050945122991747, except the new product name that should be taken from Localizer.  [CHAR LIMIT=300] [BACKUP_MESSAGE_ID: 2734050945122991747]-->

    <string name="find_hub_active" product="default">You can locate this phone with Find Hub even when powered off</string>

    <!-- Message shown during tablet shutdown when Find Hub with Dead Battery Finder is active Same as 8045583079989970505, except the new product name that should be taken from Localizer.  [CHAR LIMIT=300] [BACKUP_MESSAGE_ID: 8045583079989970505]-->

    <string name="find_hub_active" product="tablet">You can locate this tablet with Find Hub even when powered off</string>



</resources>

packages/SystemUI/res/layout/shutdown_dialog_finder_active.xml

+20 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
        app:layout_constraintTop_toBottomOf="@android:id/text2" />



    <TextView

        android:featureFlag="!android.net.platform.flags.powered_off_finding_message_new_product_name"

        android:id="@+id/finer_hint"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"
@@ -69,4 +70,23 @@ 
        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@android:id/progress"

        app:layout_constraintVertical_bias="1" />

    <TextView

        android:featureFlag="android.net.platform.flags.powered_off_finding_message_new_product_name"

        android:id="@+id/find_hub_hint"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_margin="32dp"

        android:background="@drawable/bg_shutdown_finder_message"

        android:drawablePadding="16dp"

        android:drawableStart="@drawable/ic_finder_active"

        android:fontFamily="google-sans"

        android:gravity="start"

        android:padding="20dp"

        android:text="@string/find_hub_active"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="@android:color/secondary_text_dark"

        android:textDirection="locale"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintTop_toBottomOf="@android:id/progress"

        app:layout_constraintVertical_bias="1" />

</androidx.constraintlayout.widget.ConstraintLayout>
 
 No newline at end of file