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

Commit 2230710d authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Add demo mode to dev options" into nyc-dev

am: 7b5c4007

* commit '7b5c4007':
  Add demo mode to dev options

Change-Id: I48eefd0ae371f09f8841b1aaa113cea7e208a5a9
parents 6cd4555a 7b5c4007
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -7375,4 +7375,7 @@
    <!-- [CHAR LIMIT=25] Bluetooth is disabled. -->
    <string name="bluetooth_disabled">Disabled</string>
    <!-- [CHAR LIMIT=60] Name of dev option called demo mode -->
    <string name="demo_mode">Demo mode</string>
</resources>
+6 −0
Original line number Diff line number Diff line
@@ -91,6 +91,12 @@
        android:key="ota_disable_automatic_update"
        android:title="@string/ota_disable_automatic_update" />

    <PreferenceScreen
        android:key="demo_mode"
        android:title="@string/demo_mode">
        <intent android:action="com.android.settings.action.DEMO_MODE" />
    </PreferenceScreen>

    <PreferenceCategory android:key="debug_debugging_category"
            android:title="@string/debug_debugging_category">