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

Commit 431ad737 authored by Jason Monk's avatar Jason Monk
Browse files

Move tuner enable point to QS 

Long clicking on settings gear in QS causes it to accelarate and
spin, when released it will open and enable the tuner.  On first
opening there will be a warning dialog.

Also add way to disable tuner from tuner screen. This way it can
be removed from its former home in Developer Settings.  All tuner
settings are reset when disabled to match developer settings
behavior.

Bug: 22462605
Change-Id: Ie700a6a15e6c3caccf7cd1885da73328e6fac6ab
parent 2ba3fec6

packages/SystemUI/AndroidManifest.xml

+8 −0
Original line number Diff line number Diff line
@@ -405,5 +405,13 @@ 
            android:exported="true"

            android:singleUser="true"

            android:permission="android.permission.BIND_DREAM_SERVICE" />



        <receiver

            android:name=".tuner.TunerService$ClearReceiver"

            android:exported="false">

            <intent-filter>

                <action android:name="com.android.systemui.action.CLEAR_TUNER" />

            </intent-filter>

        </receiver>

    </application>

</manifest>

packages/SystemUI/res/drawable-nodpi/tuner.xml

+8 −11
Original line number Diff line number Diff line
@@ -14,14 +14,11 @@ 
    limitations under the License.

-->

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

        android:width="48.0dp"

        android:height="48.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M29.9,24.8c0.0,-0.3 0.1,-0.5 0.1,-0.8s0.0,-0.5 -0.1,-0.8l1.7,-1.3c0.2,-0.1 0.2,-0.3 0.1,-0.5l-1.6,-2.8c-0.1,-0.2 -0.3,-0.2 -0.5,-0.2l-2.0,0.8c-0.4,-0.3 -0.9,-0.6 -1.4,-0.8L26.0,16.3c0.0,-0.2 -0.2,-0.3 -0.4,-0.3l-3.2,0.0c-0.2,0.0 -0.4,0.1 -0.4,0.3l-0.3,2.1c-0.5,0.2 -0.9,0.5 -1.4,0.8l-2.0,-0.8c-0.2,-0.1 -0.4,0.0 -0.5,0.2l-1.6,2.8c-0.1,0.2 -0.1,0.4 0.1,0.5l1.7,1.3c0.0,0.3 -0.1,0.5 -0.1,0.8s0.0,0.5 0.1,0.8l-1.7,1.3c-0.2,0.1 -0.2,0.3 -0.1,0.5l1.6,2.8c0.1,0.2 0.3,0.2 0.5,0.2l2.0,-0.8c0.4,0.3 0.9,0.6 1.4,0.8l0.3,2.1c0.0,0.2 0.2,0.3 0.4,0.3l3.2,0.0c0.2,0.0 0.4,-0.1 0.4,-0.3l0.3,-2.1c0.5,-0.2 0.9,-0.5 1.4,-0.8l2.0,0.8c0.2,0.1 0.4,0.0 0.5,-0.2l1.6,-2.8c0.1,-0.2 0.1,-0.4 -0.1,-0.5L29.9,24.8zM24.0,26.8c-1.5,0.0 -2.8,-1.3 -2.8,-2.8s1.3,-2.8 2.8,-2.8s2.8,1.3 2.8,2.8S25.5,26.8 24.0,26.8z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M18.0,38.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0s0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0S18.6,38.0 18.0,38.0zM24.0,38.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0s0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0S24.6,38.0 24.0,38.0zM30.0,38.0c-0.6,0.0 -1.0,-0.4 -1.0,-1.0s0.4,-1.0 1.0,-1.0s1.0,0.4 1.0,1.0S30.6,38.0 30.0,38.0zM42.0,6.0L6.0,6.0c-2.2,0.0 -4.0,1.8 -4.0,4.0l0.0,28.0c0.0,2.2 1.8,4.0 4.0,4.0l36.0,0.0c2.2,0.0 4.0,-1.8 4.0,-4.0L46.0,10.0C46.0,7.8 44.2,6.0 42.0,6.0zM42.0,34.0L6.0,34.0L6.0,14.0l36.0,0.0L42.0,34.0zM9.0,12.0L7.0,12.0l0.0,-2.0l2.0,0.0L9.0,12.0zM13.0,12.0l-2.0,0.0l0.0,-2.0l2.0,0.0L13.0,12.0zM17.0,12.0l-2.0,0.0l0.0,-2.0l2.0,0.0L17.0,12.0z"/>

        android:fillColor="#FFFFFFFF"

        android:pathData="M22.7,19.0l-9.1,-9.1c0.9,-2.0 0.4,-5.0 -1.5,-6.9 -2.0,-2.0 -5.0,-2.4 -7.4,-1.3L9.0,6.0 6.0,9.0 1.6,4.7C0.4,7.0 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1.0,0.4 1.4,0.0l2.3,-2.3c0.5,-0.4 0.5,-1.0 0.1,-1.4z"/>

</vector>

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+23 −6
Original line number Diff line number Diff line
@@ -44,14 +44,31 @@ 
            android:scaleType="centerInside"/>

    </com.android.systemui.statusbar.phone.MultiUserSwitch>



    <com.android.keyguard.AlphaOptimizedImageButton android:id="@+id/settings_button"

        style="@android:style/Widget.Material.Button.Borderless"

        android:layout_toStartOf="@id/multi_user_switch"

    <com.android.keyguard.AlphaOptimizedLinearLayout

        android:id="@+id/settings_button_container"

        android:layout_width="48dp"

        android:layout_height="@dimen/status_bar_header_height"

        android:paddingStart="12dp"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_toStartOf="@id/multi_user_switch">



        <com.android.systemui.statusbar.phone.SettingsButton android:id="@+id/settings_button"

            style="@android:style/Widget.Material.Button.Borderless"

            android:layout_width="24dp"

            android:layout_height="@dimen/status_bar_header_height"

            android:background="@drawable/ripple_drawable"

            android:src="@drawable/ic_settings"

            android:contentDescription="@string/accessibility_desc_settings" />

        <com.android.systemui.statusbar.AlphaOptimizedImageView android:id="@+id/tuner_icon"

            android:layout_width="12dp"

            android:layout_height="@dimen/status_bar_header_height"

            android:tint="#4DFFFFFF"

            android:tintMode="src_in"

            android:visibility="invisible"

            android:src="@drawable/tuner" />



    </com.android.keyguard.AlphaOptimizedLinearLayout>



    <LinearLayout android:id="@+id/system_icons_super_container"

        android:layout_width="wrap_content"

packages/SystemUI/res/values/strings.xml

+22 −1
Original line number Diff line number Diff line
@@ -1032,7 +1032,7 @@ 
    <string name="volume_stream_vibrate_dnd" translatable="false">%s vibrate — Priority only</string>



    <!-- Name of special SystemUI debug settings -->

    <string name="system_ui_tuner">System UI tuner</string>

    <string name="system_ui_tuner">System UI Tuner</string>



    <!-- Preference to show/hide embedded battery percentage [CHAR LIMIT=50] -->

    <string name="show_battery_percentage">Show embedded battery percentage</string>
@@ -1099,4 +1099,25 @@ 
    <!-- Accessibility label for managed profile icon (not shown on screen) [CHAR LIMIT=NONE] -->

    <string name="accessibility_managed_profile">Work profile</string>



    <!-- Title of warning when entering System UI tuner for first time [CHAR LIMIT=NONE] -->

    <string name="tuner_warning_title">Fun for some but not for all</string>



    <!-- Warning for users entering the System UI tuner for the first time [CHAR LIMIT=NONE]-->

    <string name="tuner_warning">System UI Tuner gives you extra ways to tweak and customize the Android user interface. These experimental features may change, break, or disappear in future releases. Proceed with caution.</string>



    <!-- Warning for users entering the System UI tuner [CHAR LIMIT=NONE]-->

    <string name="tuner_persistent_warning">These experimental features may change, break, or disappear in future releases. Proceed with caution.</string>



    <!-- Generic "got it" acceptance of dialog or cling [CHAR LIMIT=NONE] -->

    <string name="got_it">Got it</string>



    <!-- Toast describing tuner has been enabled [CHAR LIMIT=NONE] -->

    <string name="tuner_toast">Congrats! System UI Tuner has been added to Settings</string>



    <!-- Option to remove the tuner from settings [CHAR LIMIT=NONE] -->

    <string name="remove_from_settings">Remove from Settings</string>



    <!-- Dialog asking if the tuner should really be removed from settings [CHAR LIMIT=NONE]-->

    <string name="remove_from_settings_prompt">Remove System UI Tuner from Settings and stop using all of its features?"</string>



</resources>

packages/SystemUI/res/xml/tuner_prefs.xml

+4 −0
Original line number Diff line number Diff line
@@ -76,4 +76,8 @@ 
        android:key="demo_mode"

        android:title="@string/demo_mode" />



    <Preference

        android:summary="@string/tuner_persistent_warning"

        android:selectable="false" />



</PreferenceScreen>