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

Commit cfc8c70a authored by David Anderson's avatar David Anderson Committed by Android (Google) Code Review
Browse files

Merge "Add Device Diagnostics to Settings." into main

parents a0af333e 29f9abcd
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
package: "com.android.settings.flags"
container: "system_ext"

flag {
  name: "enable_device_diagnostics_in_settings"
  namespace: "phoenix"
  description: "Enable the Device Diagnostics app in Settings"
  bug: "309886423"
}
+10 −0
Original line number Diff line number Diff line
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="960"
    android:viewportHeight="960"
    android:tint="?android:attr/colorControlNormal">
  <path
      android:pathData="M320,760h320v-80L320,680v80ZM320,640h320v-80L320,560v80ZM480,492q66,-60 113,-106.5t47,-97.5q0,-36 -26,-62t-62,-26q-21,0 -40.5,8.5T480,232q-12,-15 -31.5,-23.5T408,200q-36,0 -62,26t-26,62q0,51 45.5,96T480,492ZM720,880L240,880q-33,0 -56.5,-23.5T160,800v-640q0,-33 23.5,-56.5T240,80h480q33,0 56.5,23.5T800,160v640q0,33 -23.5,56.5T720,880ZM240,800h480v-640L240,160v640ZM240,800v-640,640Z"
      android:fillColor="#FFFFFFFF"/>
</vector>
+3 −0
Original line number Diff line number Diff line
@@ -836,4 +836,7 @@

    <!-- The Activity intent to trigger to launch time-related feedback. -->
    <string name="config_time_feedback_intent_uri" translatable="false" />

    <!-- Package name for diagnostics app. -->
    <string name="config_device_diagnostics_package_name" translatable="false">com.android.devicediagnostics</string>
</resources>
+5 −0
Original line number Diff line number Diff line
@@ -13262,4 +13262,9 @@
    <!--Title for Sync Across Devices category-->
    <string name="sync_across_devices_title">Sync across devices</string>
    <!-- Device Diagnostics -->
    <!-- Title for System dashboard fragment -->
    <string name="device_diagnostics_title">Device diagnostics</string>
</resources>
+7 −0
Original line number Diff line number Diff line
@@ -97,6 +97,13 @@
        android:order="-40"
        settings:controller="com.android.settings.system.DeveloperOptionsController"/>

    <Preference
        android:key="device_diagnostics"
        android:title="@string/device_diagnostics_title"
        android:order="-35"
        android:icon="@drawable/ic_device_diagnostics"
        settings:controller="com.android.settings.system.DeviceDiagnosticsPreferenceController"/>

    <Preference
        android:key="reset_dashboard"
        android:title="@string/reset_dashboard_title"
Loading