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

Commit f5d7df51 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "DO NOT MERGE ANYWHERE Revert "Add the Finder shutdown message to AOSP"" into 24D1-dev

parents 1c85dcc0 fa74cd76

packages/SystemUI/res/drawable/bg_shutdown_finder_message.xml

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

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

    <corners android:radius="28dp" />

    <solid android:color="@color/global_actions_lite_button_background" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/ic_finder_active.xml

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

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:pathData="M12,0L12,0A12,12 0,0 1,24 12L24,12A12,12 0,0 1,12 24L12,24A12,12 0,0 1,0 12L0,12A12,12 0,0 1,12 0z"

      android:fillColor="#00677D"/>

  <path

      android:pathData="M12.797,4.005C11.949,3.936 11.203,4.597 11.203,5.467V6.659C8.855,7.001 6.998,8.856 6.653,11.203H5.467C4.597,11.203 3.936,11.948 4.005,12.796L4.006,12.802L4.006,12.809C4.38,16.605 7.399,19.625 11.195,20C12.051,20.087 12.803,19.404 12.803,18.547V17.355C15.154,17.012 17.013,15.154 17.355,12.803H18.54C19.406,12.803 20.079,12.058 19.992,11.196C19.618,7.4 16.606,4.388 12.812,4.006L12.804,4.006L12.797,4.005ZM11.203,9.344V8.283C9.741,8.591 8.588,9.741 8.278,11.203H9.344C9.585,10.4 10.179,9.754 10.942,9.437C11.027,9.402 11.114,9.371 11.203,9.344ZM11.998,13.171C11.358,13.175 10.828,12.651 10.827,12.004H10.827C10.827,11.959 10.83,11.915 10.835,11.871C10.885,11.427 11.185,11.056 11.59,10.902C11.694,10.863 11.806,10.838 11.921,10.83C11.948,10.833 11.976,10.834 12.003,10.834C12.65,10.834 13.177,11.356 13.179,12.007C13.177,12.622 12.695,13.13 12.091,13.175C12.06,13.172 12.029,13.17 11.998,13.171ZM17.353,11.203H18.383C18.028,8.289 15.72,5.979 12.804,5.616V6.658C15.153,7 17.004,8.852 17.353,11.203ZM14.663,11.203C14.395,10.311 13.692,9.611 12.804,9.344V8.283C14.265,8.59 15.414,9.736 15.727,11.203H14.663ZM5.615,12.803H6.654C7.001,15.15 8.855,17.002 11.203,17.346V18.391C8.287,18.034 5.972,15.719 5.615,12.803ZM11.203,14.666C10.316,14.394 9.613,13.692 9.345,12.803H8.279C8.591,14.264 9.741,15.412 11.203,15.721V14.666ZM14.661,12.811H15.729C15.418,14.272 14.266,15.422 12.804,15.73V14.662C13.689,14.396 14.391,13.699 14.661,12.811Z"

      android:fillColor="#ffffff"

      android:fillType="evenOdd"/>

</vector>

packages/SystemUI/res/layout/shutdown_dialog_finder_active.xml

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

<androidx.constraintlayout.widget.ConstraintLayout

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <TextView

        android:id="@android:id/text1"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="24dp"

        android:fontFamily="google-sans"

        android:gravity="center"

        android:text="@string/shutdown_progress"

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

        android:textDirection="locale"

        android:textSize="18sp"

        android:visibility="gone"

        app:layout_constraintBottom_toTopOf="@android:id/text2"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toTopOf="parent"

        app:layout_constraintVertical_bias="0.375"

        app:layout_constraintVertical_chainStyle="packed" />



    <TextView

        android:id="@android:id/text2"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginBottom="24dp"

        android:fontFamily="google-sans"

        android:gravity="center"

        android:text="@string/shutdown_progress"

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

        android:textDirection="locale"

        android:textSize="24sp"

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

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@android:id/text1" />



    <ProgressBar

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

        style="?android:attr/progressBarStyleLarge"

        android:layout_width="30dp"

        android:layout_height="30dp"

        android:importantForAccessibility="no"

        app:layout_constraintBottom_toBottomOf="parent"

        app:layout_constraintEnd_toEndOf="parent"

        app:layout_constraintStart_toStartOf="parent"

        app:layout_constraintTop_toBottomOf="@android:id/text2" />



    <TextView

        android:id="@+id/finer_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/finder_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

packages/SystemUI/res/values/strings.xml

+0 −5
Original line number Diff line number Diff line
@@ -2245,11 +2245,6 @@ 
    <!-- Tuner string -->

    <!-- Tuner string -->



    <!-- Message shown during shutdown when Find My Device with Dead Battery Finder is active  [CHAR LIMIT=300] -->

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

    <!-- Shutdown Progress Dialog. This is shown if the user chooses to power off the phone. [CHAR LIMIT=60] -->

    <string name="shutdown_progress">Shutting down\u2026</string>



    <!-- Text help link for care instructions for overheating devices [CHAR LIMIT=40] -->

    <string name="thermal_shutdown_dialog_help_text">See care steps</string>

    <!-- URL for care instructions for overheating devices -->

packages/SystemUI/src/com/android/systemui/dagger/FrameworkServicesModule.java

+0 −7
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ import android.media.MediaRouter2Manager; 
import android.media.projection.IMediaProjectionManager;

import android.media.projection.MediaProjectionManager;

import android.media.session.MediaSessionManager;

import android.nearby.NearbyManager;

import android.net.ConnectivityManager;

import android.net.NetworkScoreManager;

import android.net.wifi.WifiManager;
@@ -440,12 +439,6 @@ public class FrameworkServicesModule { 
        return context.getSystemService(MediaSessionManager.class);

    }



    @Provides

    @Singleton

    static NearbyManager provideNearbyManager(Context context) {

        return context.getSystemService(NearbyManager.class);

    }



    @Provides

    @Singleton

    static NetworkScoreManager provideNetworkScoreManager(Context context) {